From: Dan Brown <redacted>
Date: Fri, 10 Apr 2020 11:21:56 +0000 (+0100)
Subject: Merge branch 'feature_change_view_in_shelves_show' of git://github.com/philjak/BookSt... 
X-Git-Tag: v0.29.0~1^2~11
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/b8c16b15a9f945b72d2ca4fe0c0172ba422199bc

Merge branch 'feature_change_view_in_shelves_show' of git://github.com/philjak/BookStack into philjak-feature_change_view_in_shelves_show
---

b8c16b15a9f945b72d2ca4fe0c0172ba422199bc