diff options
| 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 |
| commit | ad3ebfed01a7bb3844349b6c00e64377bde4055b (patch) | |
| tree | 121a4e7a25b8302fa4412a6066565f86dfd4733f /ishtar_common/fixtures | |
| parent | e2a45e2db75ec6960d458ea08004becaf429d2f6 (diff) | |
| parent | c37bb6ecce45fccc1f0c9d321a785ffeeefc3366 (diff) | |
| download | Ishtar-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 'ishtar_common/fixtures')
| -rw-r--r-- | ishtar_common/fixtures/initial_importtypes-fr.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index 1b155ddf6..9ee6710c4 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -100,7 +100,7 @@ "description": "", "created_models": [], "is_template": true, - "unicity_keys": "external_id", + "unicity_keys": "code_patriarche", "users": [], "slug": "mcc-operations", "associated_models": 6, @@ -5306,4 +5306,4 @@ "force_new": false } } -]
\ No newline at end of file +] |