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)
commit44629832dd0207d7b0f50b93f1d00b4373dd4d49
tree2119c4d5d9af09936ab5d8442e70e99018d67e10
parentfc2351557096588c3763b21544996f7d9c3dae53
parent0b7deb6375af706f0b7832f359f4b0d082a697e7
Merge branch 'master' into redesign

Conflicts:
vendor/assets/leaflet/leaflet.hash.js
vendor/assets/leaflet/leaflet.js
Vendorfile
app/controllers/application_controller.rb
app/views/layouts/_head.html.erb
vendor/assets/leaflet/leaflet.js