From: Dan Brown <redacted>
Date: Sun, 19 May 2019 14:41:48 +0000 (+0100)
Subject: Merge branch 'patch-1' of git://github.com/kostefun/BookStack into kostefun-patch-1
X-Git-Tag: v0.26.2~1^2~9^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/114f10d5ca3e1f0b7070846df8e4e596487fb026

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

114f10d5ca3e1f0b7070846df8e4e596487fb026