summaryrefslogtreecommitdiff
path: root/version.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-02-17 21:09:09 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-02-17 21:09:09 +0100
commitad3ebfed01a7bb3844349b6c00e64377bde4055b (patch)
tree121a4e7a25b8302fa4412a6066565f86dfd4733f /version.py
parente2a45e2db75ec6960d458ea08004becaf429d2f6 (diff)
parentc37bb6ecce45fccc1f0c9d321a785ffeeefc3366 (diff)
downloadIshtar-ad3ebfed01a7bb3844349b6c00e64377bde4055b.tar.bz2
Ishtar-ad3ebfed01a7bb3844349b6c00e64377bde4055b.zip
Merge branch 'master' into v0.9
Conflicts: ishtar_common/migrations/0030_auto__add_state__chg_field_sourcetype_txt_idx__chg_field_authortype_tx.py
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 8fdddac48..71bcbeeac 100644
--- a/version.py
+++ b/version.py
@@ -1,4 +1,4 @@
-VERSION = (0, 99, 12, 2)
+VERSION = (0, 99, 13)
def get_version():