Merge branch 'master' into redesign
authorJohn Firebaugh <john.firebaugh@gmail.com>
Tue, 19 Nov 2013 17:42:47 +0000 (09:42 -0800)
committerJohn Firebaugh <john.firebaugh@gmail.com>
Tue, 19 Nov 2013 17:42:47 +0000 (09:42 -0800)
Conflicts:
vendor/assets/leaflet/leaflet.hash.js
vendor/assets/leaflet/leaflet.js

1  2 
Vendorfile
app/controllers/application_controller.rb
app/views/layouts/_head.html.erb
vendor/assets/leaflet/leaflet.js

diff --cc Vendorfile
Simple merge
Simple merge
index 0f0b01be2a587f901b9464cce071d2cc191529ba,fa26f6e2c6f4902dd5ea73b85aea4fea81259455..2b66295fc11d550ff12ac9f474b6684a0b635689
@@@ -8914,4 -9188,4 +9188,4 @@@ L.Map.include(
  });
  
  
--}(window, document));
++}(window, document));