From: Dan Brown <redacted>
Date: Sun, 20 May 2018 08:51:45 +0000 (+0100)
Subject: Merge branch 'master' into feature/615
X-Git-Tag: v0.22.0~1^2~11^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/8df9dab80aa75dcc9991fb2f0c525782f3daef26

Merge branch 'master' into feature/615
---

8df9dab80aa75dcc9991fb2f0c525782f3daef26