Merge branch 'master' of git://github.com/Cyber-Duck/BookStack into Cyber-Duck-master

author Dan Brown <redacted>

Thu, 27 Jul 2017 15:20:38 +0000 (16:20 +0100)

committer Dan Brown <redacted>

Thu, 27 Jul 2017 15:20:38 +0000 (16:20 +0100)
author Dan Brown <redacted>
Thu, 27 Jul 2017 15:20:38 +0000 (16:20 +0100)
committer Dan Brown <redacted>
Thu, 27 Jul 2017 15:20:38 +0000 (16:20 +0100)
diff --cc resources/views/books/show.blade.php
Simple merge
diff --cc resources/views/chapters/show.blade.php
Simple merge
diff --cc tests/Auth/LdapTest.php
Simple merge
author	Dan Brown <redacted>
	Thu, 27 Jul 2017 15:20:38 +0000 (16:20 +0100)
committer	Dan Brown <redacted>
	Thu, 27 Jul 2017 15:20:38 +0000 (16:20 +0100)
		1	2
resources/views/books/show.blade.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/views/chapters/show.blade.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Auth/LdapTest.php	patch \|	diff1 \|	diff2 \|	blob \| history