From: Dan Brown <redacted>
Date: Sun, 23 Apr 2017 19:41:45 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.16.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/1787391b07aa43a4faad10c4ed8680ef3323328c

Merge branch 'master' into release
---

1787391b07aa43a4faad10c4ed8680ef3323328c
diff --cc version
index d5bd67d22,973dcf5ac..39fa1765f
--- a/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.15.3
 -v0.16-dev
++v0.16