Merge branch 'custom-avatar-provider' of git://github.com/Vinrobot/BookStack into...

author Dan Brown <redacted>

Sat, 22 Dec 2018 18:18:14 +0000 (18:18 +0000)

committer Dan Brown <redacted>

Sat, 22 Dec 2018 18:18:14 +0000 (18:18 +0000)
author Dan Brown <redacted>
Sat, 22 Dec 2018 18:18:14 +0000 (18:18 +0000)
committer Dan Brown <redacted>
Sat, 22 Dec 2018 18:18:14 +0000 (18:18 +0000)
diff --cc .env.example
Simple merge
diff --cc config/services.php
Simple merge
author	Dan Brown <redacted>
	Sat, 22 Dec 2018 18:18:14 +0000 (18:18 +0000)
committer	Dan Brown <redacted>
	Sat, 22 Dec 2018 18:18:14 +0000 (18:18 +0000)
		1	2
.env.example	patch \|	diff1 \|	diff2 \|	blob \| history
config/services.php	patch \|	diff1 \|	diff2 \|	blob \| history