Merge branch 'master' into openstreetbugs

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 6f574f6595ff3926ed00db626c3d840ccf1996da..49b58c844c37b9f3695b03f47ed0340442de35fe 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -131,7 +131,6 @@ ActionController::Routing::Routes.draw do |map|
 
   map.connect '/index.html', :controller => 'site', :action => 'index'
   map.connect '/edit.html', :controller => 'site', :action => 'edit'
-  map.connect '/history.html', :controller => 'changeset', :action => 'list_bbox'
   map.connect '/export.html', :controller => 'site', :action => 'export'
   map.connect '/search.html', :controller => 'way_tag', :action => 'search'
   map.connect '/login.html', :controller => 'user', :action => 'login'