From: Dan Brown <redacted>
Date: Sun, 12 Aug 2018 13:22:17 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.23.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/1614b2bab03f2ac2947a46f74d68705c0594bd38

Merge branch 'master' into release
---

1614b2bab03f2ac2947a46f74d68705c0594bd38