Merge 16012:16110 from trunk.

This commit is contained in:
Tom Hughes 2009-06-25 16:32:05 +00:00
commit 02628bed1e
107 changed files with 2138 additions and 730 deletions

View file

@ -95,6 +95,7 @@ ActionController::Routing::Routes.draw do |map|
map.connect '/login', :controller => 'user', :action => 'login'
map.connect '/logout', :controller => 'user', :action => 'logout'
map.connect '/offline', :controller => 'site', :action => 'offline'
map.connect '/key', :controller => 'site', :action => 'key'
map.connect '/user/new', :controller => 'user', :action => 'new'
map.connect '/user/save', :controller => 'user', :action => 'save'
map.connect '/user/confirm', :controller => 'user', :action => 'confirm'