From: Dan Brown <redacted>
Date: Sat, 10 Nov 2018 13:54:35 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/qianmengnet/BookStack into qianmengnet... 
X-Git-Tag: v0.24.2~3^2~4^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/b012f27ae34da83cb2bb0faf8fc531a0b6055769

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

b012f27ae34da83cb2bb0faf8fc531a0b6055769