From: Honvid <redacted>
Date: Tue, 9 Jun 2020 23:46:06 +0000 (+0800)
Subject: Merge pull request #1 from BookStackApp/master
X-Git-Tag: v0.30.0~1^2~39^2^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/418fd9037f445164887626fc20ea0c3b1717006d

Merge pull request #1 from BookStackApp/master

sync the remote master
---

418fd9037f445164887626fc20ea0c3b1717006d