From: Mantikor <redacted>
Date: Mon, 6 May 2019 18:33:09 +0000 (+0300)
Subject: Merge pull request #1 from BookStackApp/master
X-Git-Tag: v0.26.1~1^2~8^2~12
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/07b889547d28e68e5fc8f923c166bd607da17ad7

Merge pull request #1 from BookStackApp/master

merge changes
---

07b889547d28e68e5fc8f923c166bd607da17ad7