annotate .svn/pristine/eb/eb34c07a1c8b0e261ba996612b090515510add98.svn-base @ 1519:afce8026aaeb redmine-2.4-integration

Merge from branch "live"
author Chris Cannam
date Tue, 09 Sep 2014 09:34:53 +0100
parents cbb26bc654de
children
rev   line source
Chris@909 1 <% unless controller_name == 'admin' && action_name == 'index' %>
Chris@909 2 <% content_for :sidebar do %>
Chris@909 3 <h3><%=l(:label_administration)%></h3>
Chris@909 4 <%= render :partial => 'admin/menu' %>
Chris@909 5 <% end %>
Chris@909 6 <% end %>
Chris@909 7
Chris@909 8 <%= render :file => "layouts/base" %>