]> BookStack Code Mirror - bookstack/commitdiff
Merge branch 'master' into release and updated version
authorDan Brown <redacted>
Sun, 11 Feb 2018 18:19:38 +0000 (18:19 +0000)
committerDan Brown <redacted>
Sun, 11 Feb 2018 18:19:38 +0000 (18:19 +0000)
1  2 
version

diff --cc version
index 6d3d55fca9a8fab52d78c43487609a408dad76df,0507cd08e3bcd70182796a18b0e80854f9a6c35f..8c20c5272156f06779f8ed57531acd7114207cee
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.19.0
 -v0.20-dev
++v0.20.0