Merge branch 'master' into HEAD

[rails.git] / app / assets / config / manifest.js

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index 478fc3492654b6c417ac424570e6b0d6a5983936..33a4d7c323d042def8973f6c8db88fcd6bd8a52c 100644 (file)
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -8,18 +8,17 @@
 //= link_directory ../stylesheets .css
 
 //= link_tree ../../../vendor/assets/iD/iD/img
+//= link_directory ../../../vendor/assets/iD/iD/data .json
 //= link_directory ../../../vendor/assets/iD/iD/locales .json
-
-//= link_directory ../../../vendor/assets/javascripts .js
+//= link_directory ../../../vendor/assets/iD/iD/mapillary-js .css
+//= link_directory ../../../vendor/assets/iD/iD/mapillary-js .js
+//= link_directory ../../../vendor/assets/iD/iD/pannellum-streetside .js
+//= link_directory ../../../vendor/assets/iD/iD/pannellum-streetside .css
 
 //= link_tree ../../../vendor/assets/leaflet .png
 
 //= link_directory ../../../vendor/assets/polyfill .js
 
-//= link_directory ../../../vendor/assets/potlatch2/help
-//= link_tree ../../../vendor/assets/potlatch2 .swf
-//= link_tree ../../../vendor/assets/potlatch2 .zip
-
-//= link_directory ../../../vendor/assets/swfobject
-
-//= link html5shiv/dist/html5shiv.js
+//= link leaflet/dist/images/marker-icon.png
+//= link leaflet/dist/images/marker-icon-2x.png
+//= link leaflet/dist/images/marker-shadow.png