From: James Geiger <redacted>
Date: Wed, 14 Aug 2019 06:10:43 +0000 (+0000)
Subject: Merge pull request #1 from BookStackApp/master
X-Git-Tag: v0.28.0~1^2~70^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/fccc112cc104ea9d53f33eb64612095e17f999a7

Merge pull request #1 from BookStackApp/master

merge aug. 11 commits
---

fccc112cc104ea9d53f33eb64612095e17f999a7