Merge pull request #904 from lommes/903-socialite-discord

author Dan Brown <redacted>

Sun, 29 Jul 2018 15:18:10 +0000 (16:18 +0100)

committer GitHub <redacted>

Sun, 29 Jul 2018 15:18:10 +0000 (16:18 +0100)
author Dan Brown <redacted>
Sun, 29 Jul 2018 15:18:10 +0000 (16:18 +0100)
committer GitHub <redacted>
Sun, 29 Jul 2018 15:18:10 +0000 (16:18 +0100)
diff --cc .env.example
Simple merge
diff --cc config/services.php
Simple merge
author	Dan Brown <redacted>
	Sun, 29 Jul 2018 15:18:10 +0000 (16:18 +0100)
committer	GitHub <redacted>
	Sun, 29 Jul 2018 15:18:10 +0000 (16:18 +0100)
		1	2
.env.example	patch \|	diff1 \|	diff2 \|	blob \| history
config/services.php	patch \|	diff1 \|	diff2 \|	blob \| history