Merge branch 'release/4.1' into dev

app/views/project_associations/new.html.erb

@@ -71,8 +71,6 @@ See doc/COPYRIGHT.rdoc for more details.
     <% end %>
   </span>
 
-
-  </br>
   <%= render :partial => 'form', :locals => {:f => f, :project => @project} %>
   <hr class="form--separator">
   <%= f.button l("timelines.add_project_association"), :name => nil,

app/views/wiki_menu_items/edit.html.erb

@@ -41,7 +41,7 @@ See doc/COPYRIGHT.rdoc for more details.
       <%= form.text_field :name, :size => 20 %>
     <% end %>
   </p>
-  </br>
+  <br>
   <div style="clear: both;"></div>
   <fieldset class="form--fieldset" id="wiki_menu_item_setting">
     <legend class="form--fieldset-legend"><%=l(:menu_item_setting)%></legend>
@@ -57,7 +57,7 @@ See doc/COPYRIGHT.rdoc for more details.
       <%= form.check_box 'new_wiki_page' %>
       <%= form.label 'new_wiki_page', l(:label_wiki_show_new_page_link) %>
 
-      </br>
+      <br>
 
       <%= form.check_box 'index_page' %>
       <%= form.label 'index_page', l(:label_wiki_show_index_page_link) %>