diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-04 21:44:27 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-04 21:44:27 +0100 |
commit | cb11379a0928b99e7801710040ac90dd1665b5ef (patch) | |
tree | 9f64e921fc66bbe0938e17c1f5325b83c4ccb73b /Makefile.example | |
parent | e62d26f17f7f0da10d7bf0f9c7d8895c88002021 (diff) | |
parent | 0b0a146fbacde80528b7fb12bfe5719fdef40c85 (diff) | |
download | Ishtar-cb11379a0928b99e7801710040ac90dd1665b5ef.tar.bz2 Ishtar-cb11379a0928b99e7801710040ac90dd1665b5ef.zip |
Merge branch 'master' into master-importers
Conflicts:
ishtar_common/fixtures/initial_importtypes-fr.json
Diffstat (limited to 'Makefile.example')
-rw-r--r-- | Makefile.example | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.example b/Makefile.example index 37d439c10..7157efc37 100644 --- a/Makefile.example +++ b/Makefile.example @@ -174,6 +174,8 @@ fixtures_common: fixtures_common_importers fixtures_spatialrefsystem ishtar_common.sourcetype \ ishtar_common.operationtype \ ishtar_common.titletype \ + ishtar_common.supporttype \ + ishtar_common.format \ > '../ishtar_common/fixtures/initial_data-'$(default_data)'.json' fixtures_common_importers: |