nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	config/routes.rb
This commit is contained in:
Raphael 2010-08-17 19:42:30 -07:00
commit d2f50008f7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/routes.rb
View file

@ -1,6 +1,6 @@
Diaspora::Application.routes.draw do |map| Diaspora::Application.routes.draw do |map|
resources :people resources :people
resources :users, :only => [:edit] resources :users, :only => [:edit, :show]
resources :status_messages resources :status_messages
resources :comments resources :comments
resources :requests resources :requests