From: Dan Brown <redacted>
Date: Sun, 10 Jul 2016 09:15:38 +0000 (+0100)
Subject: Merge branch 'patch-1' of git://github.com/younes0/BookStack into younes0-patch-1
X-Git-Tag: v0.12.0~1^2~21
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/8b899a9cf055128c2864be20f58c4312013307a4

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

8b899a9cf055128c2864be20f58c4312013307a4