diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-30 10:23:12 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-30 10:23:12 +0100 |
| commit | 11c428fdd9b68c8255f1aeb6890628425a5d8898 (patch) | |
| tree | d81c85d1b433ed3c0a658f95b1841784789e7c8a /.gitignore | |
| parent | d71ab9b6f0efc1ec27cc4dcafdad1f3119a2566a (diff) | |
| parent | 47743d97e01345b7e39a18541100a020f6cfd94d (diff) | |
| download | Ishtar-11c428fdd9b68c8255f1aeb6890628425a5d8898.tar.bz2 Ishtar-11c428fdd9b68c8255f1aeb6890628425a5d8898.zip | |
Merge branch 'develop' into develop-bootstrap
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 74e5871fa..4c38aae39 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ example_project/.coverage bootstrap-src node_modules/ package-lock.json +ishtar_common/fixtures/towns_norel-fr.json +ishtar_common/fixtures/towns-fr.json |