From: Dan Brown <redacted>
Date: Sat, 4 Aug 2018 10:35:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin' into bookshelves
X-Git-Tag: v0.24.0~1^2~16^2~11^2~10
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/b5a2d3c1c423d81b80fd7034a33ada85863a29ad?ds=sidebyside;hp=-c

Merge remote-tracking branch 'origin' into bookshelves
---

b5a2d3c1c423d81b80fd7034a33ada85863a29ad