fixing conflicts

2015-07-27 23:29:32 +02:00
parent 137267887c 99481722ce
commit cc3f151914
18 changed files with 115 additions and 23 deletions
--- a/app/views/shared/_captcha.html.erb
+++ b/app/views/shared/_captcha.html.erb
@@ -0,0 +1,3 @@
+<% if recaptcha_keys?   %>
+  <%= recaptcha_tags ajax: true, hl: I18n.locale %>
+<% end %>
--- a/app/views/shared/_tags.html.erb
+++ b/app/views/shared/_tags.html.erb
@@ -1,3 +1,3 @@
 <% if debate.tags.any? %>
-  <i class="fi-price-tag"></i> <%= tags(debate) %>
+  <i class="fi-price-tag"></i> <span class='tags'><%= tags(debate) %></span>
 <% end %>