# HG changeset patch
# User Chris Cannam
# Date 1371205819 -3600
# Node ID 097d38a736246fb0fda46b36be59422ec15f1c4d
# Parent  537026b96b8b31d07e5c18b73ebae27b54798ff2# Parent  6137548ba453185dbb6e79d4f03bdf3df5ef1dc3
Merge from branch cannam

diff -r 537026b96b8b -r 097d38a73624 app/controllers/my_controller.rb
--- a/app/controllers/my_controller.rb	Fri Jun 14 11:12:18 2013 +0100
+++ b/app/controllers/my_controller.rb	Fri Jun 14 11:30:19 2013 +0100
@@ -38,7 +38,7 @@
            }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze
 
   DEFAULT_LAYOUT = {  'left' => ['myprojects', 'activitymyprojects'], 
-                      'right' => ['tipoftheday', 'issueswatched'] 
+                      'right' => ['colleagues', 'tipoftheday', 'issueswatched'] 
                    }.freeze
 
   def index