Merge branch 'master' into discussions

2013-01-15 00:53:00 +01:00 · 2013-01-15 00:53:00 +01:00 · bda7fe38d0
commit bda7fe38d0
parent d28176b132 d8e697ac68
70 changed files with 571 additions and 311 deletions
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@ -51,8 +51,9 @@

  - if @issue.description.present?
    .ui-box-bottom
-      = preserve do
-        = markdown @issue.description
+      .wiki
+        = preserve do
+          = markdown @issue.description


 .voting_notes#notes= render "notes/notes_with_form"