From: Dan Brown <redacted>
Date: Mon, 3 Feb 2020 22:43:58 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.28.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/34854915b3e496eef87dd194d10a7787e3aaa163

Merge branch 'master' into release
---

34854915b3e496eef87dd194d10a7787e3aaa163
diff --cc version
index 20be51f08,d40040377..31950daca
--- a/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.27.5
 -v0.28-dev
++v0.28.0