cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into notes

Browse source 
Conflicts:
	app/assets/javascripts/browse.js
	app/assets/javascripts/map.js.erb
	app/assets/stylesheets/common.css.scss
	app/views/site/index.html.erb
This commit is contained in:
Tom Hughes 2012-12-01 18:22:30 +00:00
commit 78f608b114
133 changed files with 11330 additions and 2143 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/routes.rb
View file

@ -225,6 +225,7 @@ OpenStreetMap::Application.routes.draw do
# export
match '/export/start' => 'export#start', :via => :get
match '/export/finish' => 'export#finish', :via => :post
match '/export/embed' => 'export#embed', :via => :get
# messages
match '/user/:display_name/inbox' => 'message#inbox', :via => :get, :as => "inbox"