From: Dan Brown <redacted>
Date: Fri, 29 Dec 2017 16:25:15 +0000 (+0000)
Subject: Merge branch 'feature-613' of git://github.com/Abijeet/BookStack into Abijeet-feature-613
X-Git-Tag: v0.20.0~1^2~29
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/1aa4d0dc59fb118c6cf28fd71af366c1882da74b?ds=inline;hp=-c

Merge branch 'feature-613' of git://github.com/Abijeet/BookStack into Abijeet-feature-613
---

1aa4d0dc59fb118c6cf28fd71af366c1882da74b