From: Dan Brown <redacted>
Date: Sun, 4 Aug 2019 15:26:38 +0000 (+0100)
Subject: Merge branch 'master' into 129-page-templates
X-Git-Tag: v0.27~1^2~21^2~2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/2ebbc6b658e80c1a291de9d699627c82ed07577f

Merge branch 'master' into 129-page-templates
---

2ebbc6b658e80c1a291de9d699627c82ed07577f