Merge branch 'feature/71926460/vr_ad_banner' of github.com:munen/voic…

…erepublic_dev into feature/71926460/vr_ad_banner Conflicts: app/views/talks/show.html.haml
voicerepublic · Jun 17, 2014 · 12ec6d3 · 12ec6d3
2 parents cf90f82 + ae3a7eb
commit 12ec6d3
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/app/views/talks/show.html.haml b/app/views/talks/show.html.haml
@@ -113,6 +113,7 @@
               = t('.banner_title')
             %p
               = raw t('.banner_text')
+
           %a.close-x(data-toggle-stuff=".vr-banner")
             = raw '&times;'