Merge branch 'master' into terms

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 9a86f920058a179eecdb1f7d3ba9183801a30287..11f86e000e7094dbaf200e3664813c95d7ca115a 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -98,6 +98,7 @@ ActionController::Routing::Routes.draw do |map|
   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/terms', :controller => 'user', :action => 'terms'
   map.connect '/user/save', :controller => 'user', :action => 'save'
   map.connect '/user/confirm', :controller => 'user', :action => 'confirm'
   map.connect '/user/confirm-email', :controller => 'user', :action => 'confirm_email'