From: Dan Brown <redacted>
Date: Sat, 14 Jul 2018 13:17:55 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/brennanmurphy/BookStack into brennanmurphy... 
X-Git-Tag: v0.23.0~1^2~8^2~3
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/17762048701cea3eb0d213b2b4d2db2c25b9de58

Merge branch 'master' of git://github.com/brennanmurphy/BookStack into brennanmurphy-master
---

17762048701cea3eb0d213b2b4d2db2c25b9de58