diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-04-09 16:10:18 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-06-17 13:21:27 +0200 |
| commit | e11af2c30cdcca2f49e151aafe87a00c0313704c (patch) | |
| tree | 6946698ba0749916a95f7e3c0fd559556559ee9d | |
| parent | 9330923a0e3ada04787edecf031e32f1cb2d77e9 (diff) | |
| download | Ishtar-e11af2c30cdcca2f49e151aafe87a00c0313704c.tar.bz2 Ishtar-e11af2c30cdcca2f49e151aafe87a00c0313704c.zip | |
Merge migrations
| -rw-r--r-- | ishtar_common/migrations/0091_auto_20190327_1854.py (renamed from ishtar_common/migrations/0090_auto_20190327_1854.py) | 2 | ||||
| -rw-r--r-- | ishtar_common/migrations/0092_ishtarsiteprofile_display_srs.py (renamed from ishtar_common/migrations/0091_ishtarsiteprofile_display_srs.py) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/migrations/0090_auto_20190327_1854.py b/ishtar_common/migrations/0091_auto_20190327_1854.py index 9a4f8460b..8fb0ea0b2 100644 --- a/ishtar_common/migrations/0090_auto_20190327_1854.py +++ b/ishtar_common/migrations/0091_auto_20190327_1854.py @@ -12,7 +12,7 @@ import virtualtime class Migration(migrations.Migration): dependencies = [ - ('ishtar_common', '0089_import_csv_sep'), + ('ishtar_common', '0090_ishtarsiteprofile_locate_warehouses'), ] operations = [ diff --git a/ishtar_common/migrations/0091_ishtarsiteprofile_display_srs.py b/ishtar_common/migrations/0092_ishtarsiteprofile_display_srs.py index abccb6efd..60936de59 100644 --- a/ishtar_common/migrations/0091_ishtarsiteprofile_display_srs.py +++ b/ishtar_common/migrations/0092_ishtarsiteprofile_display_srs.py @@ -9,7 +9,7 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('ishtar_common', '0090_auto_20190327_1854'), + ('ishtar_common', '0091_auto_20190327_1854'), ] operations = [ |