diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-16 20:10:57 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-16 20:10:57 +0200 |
| commit | d4119bdffd893943263a82813f6b783fda0253dd (patch) | |
| tree | 8e2be9071d39542da68661a27bc402874314798a /fixtures | |
| parent | a39f989e9c02bca9e4c3127fde855364f392e3a5 (diff) | |
| parent | 5e7cda4fe8902979dac8a8008908accb8f0bfab4 (diff) | |
| download | Ishtar-d4119bdffd893943263a82813f6b783fda0253dd.tar.bz2 Ishtar-d4119bdffd893943263a82813f6b783fda0253dd.zip | |
Merge branch 'master' into v0.9
Conflicts:
install/install.sh
Diffstat (limited to 'fixtures')
| -rw-r--r-- | fixtures/initial_data-auth-fr.json | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/fixtures/initial_data-auth-fr.json b/fixtures/initial_data-auth-fr.json index a27cc4159..fb58cd390 100644 --- a/fixtures/initial_data-auth-fr.json +++ b/fixtures/initial_data-auth-fr.json @@ -331,5 +331,36 @@ 264 ] } + }, + { + "pk": 33, + "model": "auth.group", + "fields": { + "name": "Entit\u00e9s arch\u00e9ologiques : ajout", + "permissions": [ + 255 + ] + } + }, + { + "pk": 34, + "model": "auth.group", + "fields": { + "name": "Entit\u00e9s arch\u00e9ologiques : modification/suppression", + "permissions": [ + 256, + 257 + ] + } + }, + { + "pk": 35, + "model": "auth.group", + "fields": { + "name": "Entit\u00e9s arch\u00e9ologiques : voir", + "permissions": [ + 258 + ] + } } -]
\ No newline at end of file +] |