Merge remote-tracking branch 'origin/master'

2014-11-30 18:24:11 +01:00 · 2014-11-30 18:24:11 +01:00 · 5f8533ec9d
parent 52ec2cffba 1979f528a9
commit 5f8533ec9d
1 changed files with 1 additions and 0 deletions
--- a/app/views/inbox/show.html.haml
+++ b/app/views/inbox/show.html.haml
@ -12,6 +12,7 @@
            %p.answerbox-question-text= i.question.content
      .panel-body
        %textarea.form-control{name: 'ib-answer', 'data-id' => i.id}
+        %br/
        %button.btn.btn-success{name: 'ib-answer', 'data-ib-id' => i.id}
          Answer
        %button.btn.btn-danger{name: 'ib-destroy', 'data-ib-id' => i.id}