From: Dan Brown <redacted>
Date: Thu, 7 Dec 2017 18:47:07 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/Abijeet/BookStack
X-Git-Tag: v0.19.0~1^2~11
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/6063ac4a119f6defaf06b282540d815df7b040ae?ds=inline;hp=--cc

Merge branch 'master' of git://github.com/Abijeet/BookStack
---

6063ac4a119f6defaf06b282540d815df7b040ae