From: Dan Brown <redacted>
Date: Mon, 27 Feb 2017 14:57:38 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.15.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/a5d5904969516647f1403730a2ebb5b77c55531f

Merge branch 'master' into release
---

a5d5904969516647f1403730a2ebb5b77c55531f
diff --cc version
index 31b7b3198,c7f762861..c06eba1aa
--- a/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.14.3
 -v0.15-dev
++v0.15.0