Merge branch 'master' into notes

[rails.git] / app / views / browse / note.html.erb

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 4137c33c1dd5f0e351e21393d6e28bfdc3344717..12de1114f654f67d106a48e789f353a54208c442 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -44,8 +44,7 @@
           <% @note.comments[1..-1].each do |comment| %>
             <tr>
               <td>
-                <%= h(comment.body) %>
-                <br />
+                <%= comment.body.to_html %>
                 <span class="by"><%= t "browse.note.at_by_html", :when => friendly_date(comment.created_at), :user => note_author(comment) %></span>
               </td>
             </tr>