From: Tom Hughes <tom@compton.nu>
Date: Sun, 12 Feb 2017 15:04:50 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1030' into next
X-Git-Tag: live~3614^2~4
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/043d29fd7eb72048cf5d07edfbc20ec5c25af708

Merge remote-tracking branch 'openstreetmap/pull/1030' into next
---

043d29fd7eb72048cf5d07edfbc20ec5c25af708
diff --cc Vendorfile
index 361f2c843,6826e8e16..93ad74c7b
--- a/Vendorfile
+++ b/Vendorfile
@@@ -17,9 -17,14 +17,14 @@@ folder 'vendor/assets' d
      [ 'layers.png', 'layers-2x.png',
        'marker-icon.png', 'marker-icon-2x.png',
        'marker-shadow.png' ].each do |image|
 -      file "images/#{image}", "http://cdn.leafletjs.com/leaflet-0.7.3/images/#{image}"
 +      file "images/#{image}", "https://unpkg.com/leaflet@1.0.3/dist/images/#{image}"
      end
  
+     from 'git://github.com/aratcliffe/Leaflet.contextmenu.git' do
+       file 'leaflet.contextmenu.js', 'dist/leaflet.contextmenu.js'
+       file 'leaflet.contextmenu.css', 'dist/leaflet.contextmenu.css'
+     end
+ 
      from 'git://github.com/kajic/leaflet-locationfilter.git' do
        file 'leaflet.locationfilter.css', 'src/locationfilter.css'
        file 'leaflet.locationfilter.js', 'src/locationfilter.js'