From: Dan Brown <redacted>
Date: Sun, 20 Sep 2020 09:30:10 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.30.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/e22c9cae91cc848aeab67682c2ee0547b48be228

Merge branch 'master' into release
---

e22c9cae91cc848aeab67682c2ee0547b48be228
diff --cc version
index e22b5a597,31c2e1d4b..9388ecbd5
--- a/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.29.3
 -v0.30-dev
++v0.30.0