From: Dan Brown <redacted>
Date: Sun, 22 Apr 2018 19:19:02 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.21.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/9a7fecd26939b1d3cac6b0abe55176046cc38751

Merge branch 'master' into release
---

9a7fecd26939b1d3cac6b0abe55176046cc38751