Merge branch 'laravel-upgrade'

author Dan Brown <redacted>

Sat, 14 Sep 2019 13:21:24 +0000 (14:21 +0100)

committer Dan Brown <redacted>

Sat, 14 Sep 2019 13:21:24 +0000 (14:21 +0100)
author Dan Brown <redacted>
Sat, 14 Sep 2019 13:21:24 +0000 (14:21 +0100)
committer Dan Brown <redacted>
Sat, 14 Sep 2019 13:21:24 +0000 (14:21 +0100)
diff --cc resources/lang/es/auth.php
Simple merge
diff --cc resources/lang/es_AR/auth.php
Simple merge
diff --cc resources/lang/ru/auth.php
Simple merge
diff --cc resources/sass/_lists.scss
Simple merge
author	Dan Brown <redacted>
	Sat, 14 Sep 2019 13:21:24 +0000 (14:21 +0100)
committer	Dan Brown <redacted>
	Sat, 14 Sep 2019 13:21:24 +0000 (14:21 +0100)
		1	2
resources/lang/es/auth.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/lang/es_AR/auth.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/lang/ru/auth.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/sass/_lists.scss	patch \|	diff1 \|	diff2 \|	blob \| history