Merge branch 'master' of github.com:diaspora/diaspora

app/models/person.rb

@@ -50,7 +50,7 @@ class Person
   end
 
   def public_url
-    "#{self.url}users/#{self.owner.username}/public"
+    "#{self.url}users/#{self.owner.username}"
   end
 
 

config/routes.rb

@@ -11,7 +11,7 @@ Diaspora::Application.routes.draw do
   resources :albums
   
   # added public route to user
-  match 'users/:username/public', :to => 'users#public'
+  match 'users/:username', :to => 'users#public'
   resources :users,               :except => [:create, :new, :show]
 
   match 'aspects/move_friends', :to => 'aspects#move_friends', :as => 'move_friends'