From: Dan Brown <redacted>
Date: Mon, 23 Jan 2017 22:28:02 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.14.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/82d7bb1f32f7bbb0274ca4129b1b56122c0acd16

Merge branch 'master' into release
---

82d7bb1f32f7bbb0274ca4129b1b56122c0acd16