From: mark-james <redacted>
Date: Sun, 30 Dec 2018 22:00:19 +0000 (+1100)
Subject: Merge pull request #1 from BookStackApp/master
X-Git-Tag: v0.25.2~1^2~2^2~1^2~2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/0830521e60d782963e4e781b92c04eb9627abebe

Merge pull request #1 from BookStackApp/master

Update From Bookstack
---

0830521e60d782963e4e781b92c04eb9627abebe