Fixed conflict with master

2017-08-15 20:44:06 +00:00
parent 9db643a533 0719cbd1bf
commit 22d0f4423d
7 changed files with 19 additions and 8 deletions
--- a/app/views/shared/_meeting_url.html.erb
+++ b/app/views/shared/_meeting_url.html.erb
@@ -44,7 +44,7 @@
      <%= icon('envelope-o') %>
    </button>

-    <% if qrcode_generation_enabled %>
+    <% if qrcode_generation_enabled? %>
    <button type="button" class="btn btn-default meeting-url-qrcode has-tooltip"
      title="<%= t('qrcode.explanation') %>"
      data-qrcode-generated-hint="<%= t('qrcode.generated') %>"