Merge branch 'hotfix-0.12.1' into develop

[kamaki] / version

diff --git a/version b/version
index 4b7e8b5..2c493c8 100644 (file)
--- a/version
+++ b/version
@@ -1,5 +1 @@
-<<<<<<< HEAD
-0.7next
-=======
-0.7.1
->>>>>>> hotfix-0.7.1
+0.12next