From: Dan Brown <redacted>
Date: Sun, 13 Nov 2016 12:26:56 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.13.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/04f7a7d3017d7368fda1b861096b598114391459

Merge branch 'master' into release
---

04f7a7d3017d7368fda1b861096b598114391459