From: Abijeet <redacted>
Date: Sun, 4 Jun 2017 04:50:25 +0000 (+0530)
Subject: Merge branch 'BookStackApp-master'
X-Git-Tag: v0.18.0~1^2~45^2^2~18
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/6ff440e6779ff81e55789dcea1de4d8328f5e7cb

Merge branch 'BookStackApp-master'
---

6ff440e6779ff81e55789dcea1de4d8328f5e7cb