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

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

39b924f15857a5637126cdd6365babd46e152e6c