Merge branch 'master' into polls_minor_changes

This commit is contained in:
María Checa
2017-10-03 16:22:33 +02:00
47 changed files with 559 additions and 173 deletions

View File

@@ -2,4 +2,6 @@
<h2><%= t("admin.questions.edit.title") %></h2>
<%= render "form", form_url: admin_question_path(@question) %>
<div class="poll-question-form">
<%= render "form", form_url: admin_question_path(@question) %>
</div>

View File

@@ -2,4 +2,6 @@
<h2><%= t("admin.questions.new.title") %></h2>
<%= render "form", form_url: admin_questions_path %>
<div class="poll-question-form">
<%= render "form", form_url: admin_questions_path %>
</div>