From: Dan Brown <redacted>
Date: Fri, 10 Apr 2020 12:49:28 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/osmansorkar/BookStack into osmansorkar... 
X-Git-Tag: v0.29.0~1^2~8
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/da1cea06ca5db56a9635bf8bb01da2516d601620

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

da1cea06ca5db56a9635bf8bb01da2516d601620