From: Dan Brown <redacted>
Date: Sat, 10 Nov 2018 16:01:01 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.24.2~3
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/d7adcf6c690c6d90cb6d2d0eef621d302e325c4b

Merge branch 'master' into release
---

d7adcf6c690c6d90cb6d2d0eef621d302e325c4b
diff --cc version
index b61be290f,5e55414e4..6205e5bf3
--- a/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.24.1
 -v0.25-dev
++v0.24.2