diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-13 10:21:09 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-13 10:21:09 +0200 |
| commit | d28a0d05ef7a769e407626d170d051d7d185c759 (patch) | |
| tree | fe8bac9e47b5aedc1ff6529c3f8f32754b6ebf75 | |
| parent | 3cc85d1009e76c8ae03cc57b59e086fb496b8923 (diff) | |
| parent | 2257ac06f8721181a3b491bf1b750659ada85e46 (diff) | |
| download | Ishtar-d28a0d05ef7a769e407626d170d051d7d185c759.tar.bz2 Ishtar-d28a0d05ef7a769e407626d170d051d7d185c759.zip | |
Merge branch 'master' into master-WIP-treatments
| -rw-r--r-- | ishtar_common/fixtures/initial_importtypes-fr.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index 638061d6f..aa5816fc5 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -1611,7 +1611,7 @@ "model": "ishtar_common.formatertype", "fields": { "formater_type": "TypeFormater", - "many_split": "", + "many_split": "&", "options": "archaeological_finds.models.MaterialType" } }, |