diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-12 22:25:51 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-12 22:25:51 +0100 |
commit | 8bec0a17da159e3dd78cdc6e66c3c7171c092989 (patch) | |
tree | 0e9886baa8fc743c009e93c02a5dfa38671f4c37 /version.py | |
parent | cde6d2c13a479c24b6a93929938b06c353e7c2c4 (diff) | |
parent | 10e0ac399ae479f1bf646945ac7c809e168506fe (diff) | |
download | Ishtar-8bec0a17da159e3dd78cdc6e66c3c7171c092989.tar.bz2 Ishtar-8bec0a17da159e3dd78cdc6e66c3c7171c092989.zip |
Merge branch 'master' into v0.9
Conflicts:
archaeological_warehouse/migrations/0004_auto__chg_field_container_responsible.py
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 587208cee..0d66dac5d 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -VERSION = (0, 99, 1) +VERSION = (0, 99, 2) def get_version(): |