diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2013-07-16 23:28:25 +0000 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2013-07-16 23:28:25 +0000 |
| commit | 748940e2a215bf62adb0e61647d117c94dceb708 (patch) | |
| tree | 0eb9903217350f33513d97b6ddf4d4e4126c332f /archaeological_finds/fixtures | |
| parent | 23e4ba7b12751cf481015e68e1336dd5bb1042f0 (diff) | |
| parent | 06824fcb9a58226cb017ae5104aefa48874754f6 (diff) | |
| download | Ishtar-748940e2a215bf62adb0e61647d117c94dceb708.tar.bz2 Ishtar-748940e2a215bf62adb0e61647d117c94dceb708.zip | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
Diffstat (limited to 'archaeological_finds/fixtures')
| -rw-r--r-- | archaeological_finds/fixtures/initial_data-fr.json (renamed from archaeological_finds/fixtures/initial_data.json) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/archaeological_finds/fixtures/initial_data.json b/archaeological_finds/fixtures/initial_data-fr.json index b29ea6b8e..b29ea6b8e 100644 --- a/archaeological_finds/fixtures/initial_data.json +++ b/archaeological_finds/fixtures/initial_data-fr.json |