summaryrefslogtreecommitdiff
path: root/version.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-02-04 21:44:27 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-02-04 21:44:27 +0100
commit41402266b19c94f677c4f5deaba738766b8b1af3 (patch)
tree9f64e921fc66bbe0938e17c1f5325b83c4ccb73b /version.py
parentb7b200e4ba1c54d83bbda5c47c9e96ddb36bbc0d (diff)
parentc5584da2f1842ff4b593fa78a2f524bcddb86d60 (diff)
downloadIshtar-41402266b19c94f677c4f5deaba738766b8b1af3.tar.bz2
Ishtar-41402266b19c94f677c4f5deaba738766b8b1af3.zip
Merge branch 'master' into master-importers
Conflicts: ishtar_common/fixtures/initial_importtypes-fr.json
Diffstat (limited to 'version.py')
-rw-r--r--version.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.py b/version.py
index f9e9cf869..9bde12a00 100644
--- a/version.py
+++ b/version.py
@@ -1,4 +1,4 @@
-VERSION = (0, 99, 9)
+VERSION = (0, 99, 10)
def get_version():