Download as
Browse Code »

Commit ce04b5a9f66b02f6868e4d75ffcdbe352f36548f

Authored by Antonio Terceiro
2 parents faeab497 f012cd59
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Merge branch 'rel-0.16.0'

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @ce04b5a
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 73
74 <% if @page.parent && !@page.parent.path.blank? %> 74 <% if @page.parent && !@page.parent.path.blank? %>
75 <div id="article-parent"> 75 <div id="article-parent">
76 - <%= link_to_document(@page.parent, _('Up')) %> 76 + <%= link_to_document(@page.parent, _('Go back')) %>
77 </div> 77 </div>
78 <% end %> 78 <% end %>
79 79