From: Dan Brown <redacted>
Date: Sat, 5 Jan 2019 14:47:47 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/qianmengnet/BookStack into qianmengnet... 
X-Git-Tag: v0.25.0~1^2~5^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/3062bf1876326bb6370c89019cfc9e1a94dd15b7

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

3062bf1876326bb6370c89019cfc9e1a94dd15b7