From: Dan Brown <redacted>
Date: Sat, 22 Sep 2018 14:57:53 +0000 (+0100)
Subject: Merge branch 'master' into fix/#960
X-Git-Tag: v0.24.0~1^2~16
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/07bc0612c0d276d8d9fb234f570556f655afdf04?ds=inline;hp=-c

Merge branch 'master' into fix/#960
---

07bc0612c0d276d8d9fb234f570556f655afdf04