Merge branch 'master' into openstreetbugs

This commit is contained in:
Tom Hughes 2010-06-27 16:29:52 +01:00
commit 02ad2f5a51
46 changed files with 928 additions and 182 deletions

View file

@ -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'