From: Dan Brown <redacted>
Date: Sun, 19 May 2019 14:40:54 +0000 (+0100)
Subject: Merge branch 'master' into patch-5
X-Git-Tag: v0.26.2~1^2~10^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/60013f776ac53d8206dbf2d73a3c794e3ff1da7d

Merge branch 'master' into patch-5
---

60013f776ac53d8206dbf2d73a3c794e3ff1da7d