Merge branch 'master' into overpass

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 500a9b13c279c04a74a7b4ecb0023bef3ba11fda..e03c5d632110ba225e340a48feb5a4a00c490c67 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -139,6 +139,7 @@ OpenStreetMap::Application.routes.draw do
   match '/copyright/:copyright_locale' => 'site#copyright', :via => :get
   match '/copyright' => 'site#copyright', :via => :get
   match '/welcome' => 'site#welcome', :via => :get, :as => :welcome
+  match '/fixthemap' => 'site#fixthemap', :via => :get, :as => :fixthemap
   match '/help' => 'site#help', :via => :get, :as => :help
   match '/about' => 'site#about', :via => :get, :as => :about
   match '/history' => 'changeset#list', :via => :get
@@ -149,6 +150,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