From: Dan Brown <redacted>
Date: Sun, 20 May 2018 09:13:34 +0000 (+0100)
Subject: Merge branch 'feature/615'
X-Git-Tag: v0.22.0~1^2~11
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/019b8196ad9012cbbd3ddfc2ea0033f0dd03c566

Merge branch 'feature/615'
---

019b8196ad9012cbbd3ddfc2ea0033f0dd03c566