From: Dan Brown <redacted>
Date: Mon, 27 May 2019 12:47:47 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.26.2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/33a04697ef2a0642c7b9bc76b44e390fede68ce6

Merge branch 'master' into release
---

33a04697ef2a0642c7b9bc76b44e390fede68ce6