From: Nilesh Deepak <redacted>
Date: Sat, 15 Jul 2017 10:43:48 +0000 (+0530)
Subject: Merge branch 'master' of https://github.com/OsmosysSoftware/BookStack
X-Git-Tag: v0.19.0~1^2~15^2~19
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/e5dc0e6bb8459e6aa564b29f780d67f77d0723cb

Merge branch 'master' of https://github.com/OsmosysSoftware/BookStack
---

e5dc0e6bb8459e6aa564b29f780d67f77d0723cb