From: Dan Brown <redacted>
Date: Thu, 17 Oct 2019 13:09:07 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/almandin/BookStack into almandin-master
X-Git-Tag: v0.28.0~1^2~73
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/5a887e31da9678d2fc6d5961dd6224014c749098

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

5a887e31da9678d2fc6d5961dd6224014c749098