Merge branch 'feature/autoregistration_social_login' of git://github.com/ibrahimennaf...

author Dan Brown <redacted>

Fri, 21 Sep 2018 15:14:52 +0000 (16:14 +0100)

committer Dan Brown <redacted>

Fri, 21 Sep 2018 15:14:52 +0000 (16:14 +0100)
author Dan Brown <redacted>
Fri, 21 Sep 2018 15:14:52 +0000 (16:14 +0100)
committer Dan Brown <redacted>
Fri, 21 Sep 2018 15:14:52 +0000 (16:14 +0100)
diff --cc resources/lang/en/settings.php
Simple merge
diff --cc resources/views/settings/index.blade.php
Simple merge
author	Dan Brown <redacted>
	Fri, 21 Sep 2018 15:14:52 +0000 (16:14 +0100)
committer	Dan Brown <redacted>
	Fri, 21 Sep 2018 15:14:52 +0000 (16:14 +0100)
		1	2
resources/lang/en/settings.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/views/settings/index.blade.php	patch \|	diff1 \|	diff2 \|	blob \| history