Merge remote-tracking branch 'upstream/pull/2722'

[rails.git] / Vendorfile

diff --git a/Vendorfile b/Vendorfile
index 5deed27a6eb2e7d22bafac96819bc3f8b2a1053f..f940b9ece87372d3a7f07765fdef8c83f7f915bf 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -47,6 +47,7 @@ folder 'vendor/assets' do
 
   folder 'iD' do
     from 'git://github.com/openstreetmap/iD', :branch => 'release' do
+      folder 'iD/data', 'dist/data'
       folder 'iD/img', 'dist/img'
       folder 'iD/locales', 'dist/locales'
       folder 'iD/mapillary-js', 'dist/mapillary-js'
@@ -58,7 +59,7 @@ folder 'vendor/assets' do
         end
       end
 
-      file 'iD.js', 'dist/iD.js'
+      file 'iD.js', 'dist/iD.legacy.js'
     end
   end