summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-10-24 17:23:31 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-10-24 17:23:31 +0200
commit92d22b1ce956af34fb7b98f7bc280ec6ad94d46b (patch)
tree7e1a006ff22997f73ac52663f190daeea9031b62 /ishtar_common
parent1f065868a914dc2c7b64ac1d2720b6dfdb76ed65 (diff)
parent973780ccc3aaceeefa754530fbe63869a3c03504 (diff)
downloadIshtar-92d22b1ce956af34fb7b98f7bc280ec6ad94d46b.tar.bz2
Ishtar-92d22b1ce956af34fb7b98f7bc280ec6ad94d46b.zip
Merge branch 'master' into develop
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/fixtures/initial_data-fr.json3
1 files changed, 3 insertions, 0 deletions
diff --git a/ishtar_common/fixtures/initial_data-fr.json b/ishtar_common/fixtures/initial_data-fr.json
index d9026cf49..4045094d9 100644
--- a/ishtar_common/fixtures/initial_data-fr.json
+++ b/ishtar_common/fixtures/initial_data-fr.json
@@ -839,6 +839,9 @@
],
[
"Documents op\u00e9ration : lecture"
+ ],
+ [
+ "Contenants : lecture"
]
]
}