Matt Amos a3eb48385b 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		2014-11-03 11:08:13 +00:00
..
directions_engines	Supply hints for OSRM	2014-05-14 16:00:31 -07:00
browse.js	Add a close icon to the feature warning panel	2013-12-18 00:14:29 +00:00
changeset.js	Changeset discussions	2014-10-23 21:24:51 +01:00
directions.js.erb	Permalinks for directions	2014-05-14 15:52:25 -07:00
export.js	Remove unused (and bogus) code	2014-03-13 17:33:46 +00:00
history.js	Ignore clicks on history entries if the mouse has moved	2014-03-31 11:25:40 +01:00
new_note.js.erb	Fix javascript eror redirecting to new notes	2013-12-01 22:41:30 +00:00
note.js.erb	Make sure the hash updates properly on browse pages	2014-03-16 14:11:29 +00:00
notes.js.erb	Don't try and route to a note with no ID	2014-04-26 00:13:49 +01:00
search.js	Merge remote-tracking branch 'upstream/master' into routing	2014-11-03 11:08:13 +00:00