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

app/views/shared/_aspect_friends.haml

@@ -6,11 +6,11 @@
   = owner_image_link
   - for friend in @friends
     = person_image_link(friend)
-    - if @logged_in && (@aspect == :public)
-      %h3 Facebook Friends
-      - @fb_friends = MiniFB.get(@access_token, 'me', :type => "friends")                                                                                            
-      - @fb_friends[:data].each do |friend|            
-        = image_tag( "http://graph.facebook.com/#{friend[:id]}/picture" )
+  - if @logged_in && (@aspect == :public)
+    %h3 Facebook Friends
+    - @fb_friends = MiniFB.get(@access_token, 'me', :type => "friends")                                                                                            
+    - @fb_friends[:data].each do |friend|            
+      = image_tag( "http://graph.facebook.com/#{friend[:id]}/picture" )
   -unless (@aspect == :all) || (@aspect == :public)
     = link_to (image_tag('add_friend_button.png', :height => "50px", :width => "50px")), "#add_request_pane", :id => 'add_request_button'
 

config/deploy_config.yml

@@ -6,7 +6,7 @@ cross_server:
   deploy_to: '/usr/local/app/diaspora'
   user: 'root'
   repo: 'git://github.com/diaspora/diaspora.git'
-  branch: 'salmon_refactor'
+  branch: 'master'
   default_env: 'development'
 servers:
   tom: