Merge branch 'master' into moderation

[rails.git] / app / views / user / view.html.erb

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index b81d980a529e5172a36e7baf8a92ab72dc4d58a7..f797c4ba4e742ffb7bc406782ff38a427c44eeb0 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -200,7 +200,7 @@
     <% nearby = @this_user.nearby - friends %>
 
   <div class="activity-block column-1">
-    <h3><%= t 'user.view.your friends' %></h3>
+    <h3><%= t 'user.view.my friends' %></h3>
 
     <% if friends.empty? %>
       <%= t 'user.view.no friends' %>