From: Dan Brown <redacted>
Date: Sat, 20 Jan 2018 14:06:44 +0000 (+0000)
Subject: Merge branch 'master' into draw.io to fetch auth image changes
X-Git-Tag: v0.20.0~1^2~21^2~6
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/0c383eee5badf7fef3dbc643fae017d98e726750

Merge branch 'master' into draw.io to fetch auth image changes
---

0c383eee5badf7fef3dbc643fae017d98e726750