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

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

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index 97d6f8b98189d46b0e0a8c41330b2748238345c2..85b5cb86045491ce6576b0c0d859598216131655 100644 (file)
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -12,21 +12,13 @@
 //= link_directory ../../../vendor/assets/iD/iD/locales .json
 //= 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_directory ../../../vendor/assets/iD/iD/pannellum .js
+//= link_directory ../../../vendor/assets/iD/iD/pannellum .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