summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValérie-Emma Leroux <emma@iggdrasil.net>2017-02-03 16:57:22 +0100
committerValérie-Emma Leroux <emma@iggdrasil.net>2017-02-03 16:57:22 +0100
commita42effa9c928117ff1ee3fe510c42fafef8932f8 (patch)
treecc1b490e0e9a0414c69bb0e3672715e844c1ba42
parentc2b83775680f07259cc2181881975283ffda7547 (diff)
parent06034b6c15b3ae6cc61003520eb564091c42d8f0 (diff)
downloadIshtar-a42effa9c928117ff1ee3fe510c42fafef8932f8.tar.bz2
Ishtar-a42effa9c928117ff1ee3fe510c42fafef8932f8.zip
Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar
-rw-r--r--CHANGES.md10
-rw-r--r--version.py2
2 files changed, 11 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index b9f44172a..73754910d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,16 @@
Ishtar changelog
================
+0.99.9 (2017-02-03)
+-------------------
+
+### Features ###
+- Admin: add comment columns for general types
+
+### Bug fixes ###
+- get_item: deactivate hierarchic dependency when the parent item is a basket
+- Fix find-basket for own request
+
0.99.8 (2017-02-02)
-------------------
diff --git a/version.py b/version.py
index 5ba0bab42..f9e9cf869 100644
--- a/version.py
+++ b/version.py
@@ -1,4 +1,4 @@
-VERSION = (0, 99, 8)
+VERSION = (0, 99, 9)
def get_version():