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

Merge remote-tracking branch 'upstream/master' into routing-merge

Browse source 
Conflicts:
	app/assets/javascripts/index.js
	config/locales/en.yml
This commit is contained in:
Matt Amos 2014-11-10 16:14:06 +00:00
commit 0cb475cc1a
29 changed files with 601 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/routes.rb
View file

@ -157,6 +157,7 @@ OpenStreetMap::Application.routes.draw do
match '/offline' => 'site#offline', :via => :get
match '/key' => 'site#key', :via => :get
match '/id' => 'site#id', :via => :get
match '/query' => 'browse#query', :via => :get
match '/user/new' => 'user#new', :via => :get
match '/user/new' => 'user#create', :via => :post
match '/user/terms' => 'user#terms', :via => :get