Merge branch 'master' into draw.io to fetch auth image changes

author Dan Brown <redacted>

Sat, 20 Jan 2018 14:06:44 +0000 (14:06 +0000)

committer Dan Brown <redacted>

Sat, 20 Jan 2018 14:06:44 +0000 (14:06 +0000)
author Dan Brown <redacted>
Sat, 20 Jan 2018 14:06:44 +0000 (14:06 +0000)
committer Dan Brown <redacted>
Sat, 20 Jan 2018 14:06:44 +0000 (14:06 +0000)
diff --cc app/Http/Controllers/ImageController.php
Simple merge
diff --cc app/Repos/ImageRepo.php
Simple merge
diff --cc app/Services/ImageService.php
Simple merge
diff --cc routes/web.php
Simple merge
author	Dan Brown <redacted>
	Sat, 20 Jan 2018 14:06:44 +0000 (14:06 +0000)
committer	Dan Brown <redacted>
	Sat, 20 Jan 2018 14:06:44 +0000 (14:06 +0000)
		1	2
app/Http/Controllers/ImageController.php	patch \|	diff1 \|	diff2 \|	blob \| history
app/Repos/ImageRepo.php	patch \|	diff1 \|	diff2 \|	blob \| history
app/Services/ImageService.php	patch \|	diff1 \|	diff2 \|	blob \| history
routes/web.php	patch \|	diff1 \|	diff2 \|	blob \| history