From: Dan Brown <redacted>
Date: Sun, 30 Oct 2016 13:18:23 +0000 (+0000)
Subject: Merge branch 'v0.12' into release
X-Git-Tag: v0.12.2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/97bbf79ffd6d29de454f726c019e9937dff093ab

Merge branch 'v0.12' into release
---

97bbf79ffd6d29de454f726c019e9937dff093ab