From: Dan Brown <redacted>
Date: Sat, 31 Aug 2019 13:15:18 +0000 (+0100)
Subject: Merge branch 'master' into release and set version
X-Git-Tag: v0.27~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/75e7454a5f4194de2d7a47d5c2aade965dbc72a1

Merge branch 'master' into release and set version
---

75e7454a5f4194de2d7a47d5c2aade965dbc72a1
diff --cc version
index 6f681c6cc,4494802a4..b2e979cba
--- a/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.26.4
 -v0.27-dev
++v0.27