From: Dan Brown <redacted>
Date: Sun, 11 Feb 2018 18:19:38 +0000 (+0000)
Subject: Merge branch 'master' into release and updated version
X-Git-Tag: v0.20.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/ac3ba594a4e152ad08e8374af1495dbf400e06ad

Merge branch 'master' into release and updated version
---

ac3ba594a4e152ad08e8374af1495dbf400e06ad
diff --cc version
index 6d3d55fca,0507cd08e..8c20c5272
--- a/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.19.0
 -v0.20-dev
++v0.20.0