From: Dan Brown <redacted>
Date: Thu, 27 Jul 2017 15:20:38 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/Cyber-Duck/BookStack into Cyber-Duck-master
X-Git-Tag: v0.17.4~1^2~3^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/c1fc06ae3448c3c175c03721d2d97b2b102b2e4a

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

c1fc06ae3448c3c175c03721d2d97b2b102b2e4a