From: Leonardo <redacted>
Date: Mon, 2 Sep 2019 20:04:11 +0000 (-0300)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v0.27.4~1^2~10^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/a1f89ad5899453ebe3559a35112aca5332ed8952

Merge remote-tracking branch 'upstream/master'
---

a1f89ad5899453ebe3559a35112aca5332ed8952