changeset 317:2c9d65eff252 live

Merge from branch "cannam-pre-20110113-merge"
author Chris Cannam
date Mon, 28 Mar 2011 18:08:24 +0100
parents c80103b81194 (current diff) cf680b826117 (diff)
children f7c525dc7585 eabb08b4afc3
files
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/app/views/projects/settings/_members.rhtml	Mon Mar 28 18:05:05 2011 +0100
+++ b/app/views/projects/settings/_members.rhtml	Mon Mar 28 18:08:24 2011 +0100
@@ -75,7 +75,6 @@
 		</div>
 		
     <p><%= l(:label_set_role_plural) %>:</p>
-    <p>
     <% roles.each do |role| %>
     	<label><%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %> </label><div style="margin-left: 2em; margin-bottom: 0.5em"><i><%=l( 'label_' + role.name.downcase + "_description").to_sym %></i></div>
    	<% end %>