From: Dan Brown <redacted>
Date: Tue, 1 Aug 2017 19:04:33 +0000 (+0100)
Subject: Merge branch 'Abijeet-master'
X-Git-Tag: v0.18.0~1^2~45
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/79cfd39fde89ee4889c44954ddad9afd84ee9f1d

Merge branch 'Abijeet-master'
---

79cfd39fde89ee4889c44954ddad9afd84ee9f1d