Merge branch 'master' into redesign

[rails.git] / Vendorfile

diff --git a/Vendorfile b/Vendorfile
index 4fc1e53485cb1407c857682707ac6f2f4b217c0b..2d728ab1ebe0ca30c34cb7cd9762c0c6172b824c 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -31,10 +31,6 @@ folder 'vendor/assets' do
     from 'git://github.com/jfirebaugh/leaflet-osm.git' do
       file 'leaflet.osm.js', 'leaflet-osm.js'
     end
-
-    from 'git://github.com/mlevans/leaflet-hash.git' do
-      file 'leaflet.hash.js', 'leaflet-hash.js'
-    end
   end
 
   folder 'ohauth' do
@@ -53,4 +49,8 @@ folder 'vendor/assets' do
       file 'iD.js', 'dist/iD.js'
     end
   end
+
+  folder 'javascripts' do
+    file 'html5shiv.js', 'https://raw.github.com/aFarkas/html5shiv/master/src/html5shiv.js'
+  end
 end