Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots

Conflicts: config/routes.rb
2010-08-17 19:42:30 -07:00 · 2010-08-17 19:42:30 -07:00 · d2f50008f7
commit d2f50008f7
parent 456e9e9634 0f9190cd02
1 changed files with 1 additions and 1 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -1,6 +1,6 @@
 Diaspora::Application.routes.draw do |map|
  resources :people
-  resources :users, :only => [:edit]
+  resources :users, :only => [:edit, :show]
  resources :status_messages
  resources :comments
  resources :requests