From: Dan Brown <redacted>
Date: Fri, 30 Mar 2018 14:33:23 +0000 (+0100)
Subject: Merge branch 'v0.20' into release
X-Git-Tag: v0.20.2^0
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/a0381f76bffc1fcac44608b8562749061dca61fb?hp=--cc

Merge branch 'v0.20' into release
---

a0381f76bffc1fcac44608b8562749061dca61fb