From: Dan Brown <redacted>
Date: Sun, 30 Apr 2017 18:50:29 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.16.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/2b25bf6f3bb16d62d4dc6b14e553675dd5ad4189

Merge branch 'master' into release
---

2b25bf6f3bb16d62d4dc6b14e553675dd5ad4189