diff options
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 |
commit | cb11379a0928b99e7801710040ac90dd1665b5ef (patch) | |
tree | 9f64e921fc66bbe0938e17c1f5325b83c4ccb73b /version.py | |
parent | e62d26f17f7f0da10d7bf0f9c7d8895c88002021 (diff) | |
parent | 0b0a146fbacde80528b7fb12bfe5719fdef40c85 (diff) | |
download | Ishtar-cb11379a0928b99e7801710040ac90dd1665b5ef.tar.bz2 Ishtar-cb11379a0928b99e7801710040ac90dd1665b5ef.zip |
Merge branch 'master' into master-importers
Conflicts:
ishtar_common/fixtures/initial_importtypes-fr.json
Diffstat (limited to 'version.py')
-rw-r--r-- | version.py | 2 |
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(): |