Mercurial > hg > soundsoftware-site
view .svn/pristine/e9/e9dadf508df9bd7d0209e39bdd63dbc10563a076.svn-base @ 1485:c8d3ad483bea redmine-2.4-integration
Fix stray merge markers
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Wed, 15 Jan 2014 13:34:12 +0000 |
parents | 038ba2d95de8 |
children |
line wrap: on
line source
<% if @wiki && @wiki.sidebar -%> <%= textilizable @wiki.sidebar.content, :text %> <% end -%> <h3><%= l(:label_wiki) %></h3> <%= link_to l(:field_start_page), {:action => 'show', :id => nil} %><br /> <%= link_to l(:label_index_by_title), {:action => 'index'} %><br /> <%= link_to l(:label_index_by_date), {:controller => 'wiki', :project_id => @project, :action => 'date_index'} %><br />