From: Dan Brown <redacted>
Date: Sat, 20 Apr 2019 12:30:50 +0000 (+0100)
Subject: Merge branch 'patch-1' of git://github.com/XVilka/BookStack into XVilka-patch-1
X-Git-Tag: v0.26.0~1^2~13^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/553d3ce861c733ff6a90956ef71f116028f3f49b?ds=inline;hp=--cc

Merge branch 'patch-1' of git://github.com/XVilka/BookStack into XVilka-patch-1
---

553d3ce861c733ff6a90956ef71f116028f3f49b