Merge remote-tracking branch 'origin/master'

This commit is contained in:
nilsding 2014-11-30 18:24:11 +01:00
commit 5f8533ec9d
1 changed files with 1 additions and 0 deletions

View File

@ -12,6 +12,7 @@
%p.answerbox-question-text= i.question.content %p.answerbox-question-text= i.question.content
.panel-body .panel-body
%textarea.form-control{name: 'ib-answer', 'data-id' => i.id} %textarea.form-control{name: 'ib-answer', 'data-id' => i.id}
%br/
%button.btn.btn-success{name: 'ib-answer', 'data-ib-id' => i.id} %button.btn.btn-success{name: 'ib-answer', 'data-ib-id' => i.id}
Answer Answer
%button.btn.btn-danger{name: 'ib-destroy', 'data-ib-id' => i.id} %button.btn.btn-danger{name: 'ib-destroy', 'data-ib-id' => i.id}