From: Leonardo Martinez <redacted>
Date: Tue, 26 Jun 2018 12:37:20 +0000 (-0300)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v0.23.0~1^2~12^2~1^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/refs/pull/886/head

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

f7b808a9e6ba4e6356e4fb96f3f10ddc3d9478fd