From: Dan Brown <redacted>
Date: Tue, 7 May 2019 22:05:10 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.26.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/9443ae9f4046e148ba29c43b71fbe381d41219e3

Merge branch 'master' into release
---

9443ae9f4046e148ba29c43b71fbe381d41219e3
diff --cc version
index eaf8bae70,a36148419..332a47bc8
--- a/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.26.0
 -v0.26-dev
++v0.26.1