From: Dan Brown <redacted>
Date: Sat, 20 Jan 2018 14:01:56 +0000 (+0000)
Subject: Merge branch 'master' into draw.io
X-Git-Tag: v0.20.0~1^2~21^2~7
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/34782fbc912f0a2e5d8329953905d13c601f8d21

Merge branch 'master' into draw.io
---

34782fbc912f0a2e5d8329953905d13c601f8d21