diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-08-23 17:49:01 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-08-23 17:49:01 +0100 |
| commit | 5ea4882f38bcf18016c82c1e6119c4df5237e96e (patch) | |
| tree | a393c38b8b4273eee7f4a693c6f4c7a7bd55266f /config/routes.rb | |
| parent | db8bb7fa5440855420b8f3ce24611a766e52f89e (diff) | |
| parent | a311a1892507aacec5bfb2837dd10f5257dfb42c (diff) | |
Merge remote-tracking branch 'origin/release/0.6.4' into wdtk
Conflicts:
app/views/request/show.rhtml
spec/models/info_request_spec.rb
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index a9c2c889a..34232b55b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -80,7 +80,7 @@ ActionController::Routing::Routes.draw do |map| # Use /profile for things to do with the currently signed in user. # Use /user/XXXX for things that anyone can see about that user. - # Note that /profile isn't indexe by search (see robots.txt) + # Note that /profile isn't indexed by search (see robots.txt) map.with_options :controller => 'user' do |user| user.signin '/profile/sign_in', :action => 'signin' user.signup '/profile/sign_up', :action => 'signup' |