Merge pull request #947 from BookStackApp/bookshelves

author Dan Brown <redacted>

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

committer GitHub <redacted>

Fri, 21 Sep 2018 14:29:52 +0000 (15:29 +0100)
author Dan Brown <redacted>
Fri, 21 Sep 2018 14:29:52 +0000 (15:29 +0100)
committer GitHub <redacted>
Fri, 21 Sep 2018 14:29:52 +0000 (15:29 +0100)
diff --cc resources/assets/sass/_lists.scss
Simple merge
diff --cc resources/lang/en/entities.php
Simple merge
diff --cc routes/web.php
Simple merge
author	Dan Brown <redacted>
	Fri, 21 Sep 2018 14:29:52 +0000 (15:29 +0100)
committer	GitHub <redacted>
	Fri, 21 Sep 2018 14:29:52 +0000 (15:29 +0100)
		1	2
resources/assets/sass/_lists.scss	patch \|	diff1 \|	diff2 \|	blob \| history
resources/lang/en/entities.php	patch \|	diff1 \|	diff2 \|	blob \| history
routes/web.php	patch \|	diff1 \|	diff2 \|	blob \| history