summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-22 00:26:43 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-22 00:26:43 +0100
commite6a72c7acb35c95e33d8a6d019fdb8bce0f42061 (patch)
tree669eb9f8bc65c2ebbf638f03dd0ab0a8526f2025
parent0cb931948cc3baa8493022857c3239df66ca5cfe (diff)
parent75730c0ac55c935c03e58977405b4b8a2233595d (diff)
downloadIshtar-e6a72c7acb35c95e33d8a6d019fdb8bce0f42061.tar.bz2
Ishtar-e6a72c7acb35c95e33d8a6d019fdb8bce0f42061.zip
Merge branch 'v0.9' into wheezy
-rw-r--r--ishtar_common/migrations/0027_auto__add_field_import_name.py (renamed from ishtar_common/migrations/0026_auto__add_field_import_name.py)0
-rw-r--r--ishtar_common/migrations/0028_auto__add_field_authortype_order.py (renamed from ishtar_common/migrations/0027_auto__add_field_authortype_order.py)0
2 files changed, 0 insertions, 0 deletions
diff --git a/ishtar_common/migrations/0026_auto__add_field_import_name.py b/ishtar_common/migrations/0027_auto__add_field_import_name.py
index 8374ce83f..8374ce83f 100644
--- a/ishtar_common/migrations/0026_auto__add_field_import_name.py
+++ b/ishtar_common/migrations/0027_auto__add_field_import_name.py
diff --git a/ishtar_common/migrations/0027_auto__add_field_authortype_order.py b/ishtar_common/migrations/0028_auto__add_field_authortype_order.py
index e768e57de..e768e57de 100644
--- a/ishtar_common/migrations/0027_auto__add_field_authortype_order.py
+++ b/ishtar_common/migrations/0028_auto__add_field_authortype_order.py