summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-22 00:00:58 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-22 00:00:58 +0100
commitfa347d4fadf7cd21151f643bbc30bb9b3aa23552 (patch)
tree2744f865bbc5c60114df113e05c528ed43837463 /ishtar_common
parentb8cf790377a2ece768ea19bd1d216fdf0ee78cda (diff)
parentff23fe5098cf92cf770a2406f71f9ae2f8795a8a (diff)
downloadIshtar-fa347d4fadf7cd21151f643bbc30bb9b3aa23552.tar.bz2
Ishtar-fa347d4fadf7cd21151f643bbc30bb9b3aa23552.zip
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/migrations/0026_auto__add_field_import_name.py (renamed from ishtar_common/migrations/0074_auto__add_field_import_name.py)0
-rw-r--r--ishtar_common/migrations/0027_auto__add_field_authortype_order.py (renamed from ishtar_common/migrations/0075_auto__add_field_authortype_order.py)0
2 files changed, 0 insertions, 0 deletions
diff --git a/ishtar_common/migrations/0074_auto__add_field_import_name.py b/ishtar_common/migrations/0026_auto__add_field_import_name.py
index 8374ce83f..8374ce83f 100644
--- a/ishtar_common/migrations/0074_auto__add_field_import_name.py
+++ b/ishtar_common/migrations/0026_auto__add_field_import_name.py
diff --git a/ishtar_common/migrations/0075_auto__add_field_authortype_order.py b/ishtar_common/migrations/0027_auto__add_field_authortype_order.py
index e768e57de..e768e57de 100644
--- a/ishtar_common/migrations/0075_auto__add_field_authortype_order.py
+++ b/ishtar_common/migrations/0027_auto__add_field_authortype_order.py