From: Dan Brown <redacted>
Date: Fri, 29 Dec 2017 16:03:34 +0000 (+0000)
Subject: Merge branch 'feature-579' of git://github.com/Abijeet/BookStack into Abijeet-feature-579
X-Git-Tag: v0.20.0~1^2~31
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/3eb22462917910078faa05c1dc014d401088b615

Merge branch 'feature-579' of git://github.com/Abijeet/BookStack into Abijeet-feature-579
---

3eb22462917910078faa05c1dc014d401088b615