From: Dan Brown <redacted>
Date: Mon, 28 May 2018 13:19:04 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.22.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/9f961f95f8ddca5042d7855af435794161b1fb4c

Merge branch 'master' into release
---

9f961f95f8ddca5042d7855af435794161b1fb4c
diff --cc version
index 759e855fb,648d22261..4f2794371
--- a/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.21.0
 -v0.22-dev
++v0.22.0