From: Dan Brown <redacted>
Date: Wed, 20 Sep 2017 20:35:33 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.18.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/15736777a0c1ea5834fc55b25fb6785464e2dc3f

Merge branch 'master' into release
---

15736777a0c1ea5834fc55b25fb6785464e2dc3f