Merge remote-tracking branch 'upstream/master' into routing
authorMatt Amos <zerebubuth@gmail.com>
Mon, 3 Nov 2014 11:08:13 +0000 (11:08 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Mon, 3 Nov 2014 11:08:13 +0000 (11:08 +0000)
commita3eb48385bcf1465339d473c0c1657e075cd507d
treec39a7d15ab9c6b1c030f3d21feeb7ce6084fcc2b
parentbf5f842c23a469cf2098ae7953f1f8cd9534e361
parent2f228437324d80cb8a408d27912cc716a36aa3b0
Merge remote-tracking branch 'upstream/master' into routing

Conflicts:
app/assets/javascripts/index.js
app/assets/javascripts/leaflet.map.js.erb
config/environments/production.rb
config/locales/de.yml
app/assets/javascripts/index.js
app/assets/javascripts/index/search.js
app/assets/javascripts/leaflet.map.js.erb
app/assets/javascripts/router.js
app/assets/stylesheets/common.css.scss
config/initializers/assets.rb
config/locales/de.yml
config/locales/en.yml
config/routes.rb