From: jzoy <redacted>
Date: Sat, 11 Apr 2020 13:18:17 +0000 (+0800)
Subject: Merge pull request #2 from BookStackApp/master
X-Git-Tag: v0.29.0~1^2^2~1^2~2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/7673a2bd6c2705a952d0e473f364aff0b1cbf905

Merge pull request #2 from BookStackApp/master

fetch upstream
---

7673a2bd6c2705a952d0e473f364aff0b1cbf905