From: Dan Brown <redacted>
Date: Sun, 25 Mar 2018 15:54:48 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.20.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/c6134d162d69095cec7b21e34c19c6fc45c2e44b

Merge branch 'master' into release
---

c6134d162d69095cec7b21e34c19c6fc45c2e44b