Merge branch 'master' into stable

Victor Costa
2 parents eea6ad9b c456fe22
Showing 1 changed file with 1 additions and 3 deletions Show diff stats
app/views/blocks/my_network.html.erb
 <%= block_title(title) %>
  
-<%= render_profile_actions owner.class %>
-
 <ul>
   <li><%= link_to(_('Homepage'), owner.url, :class => 'url') %></li>
   <li><%= link_to(_('View profile'), owner.public_profile_url) %></li>
@@ -11,5 +9,5 @@
 </ul>
  
 <div class="my-network-actions">
-  <%= render 'blocks/profile_info_actions/' + owner.class.name.underscore %>
+  <%= render_profile_actions owner.class %>
 </div>
1	1	<%= block_title(title) %>
2	2
3		-<%= render_profile_actions owner.class %>
4		-
5	3	<ul>
6	4	<li><%= link_to(_('Homepage'), owner.url, :class => 'url') %></li>
7	5	<li><%= link_to(_('View profile'), owner.public_profile_url) %></li>
...	...	@@ -11,5 +9,5 @@
11	9	</ul>
12	10
13	11	<div class="my-network-actions">
14		- <%= render 'blocks/profile_info_actions/' + owner.class.name.underscore %>
	12	+ <%= render_profile_actions owner.class %>
15	13	</div>
...	...