Merge branch 'master' into polls

2017-01-02 12:14:40 +01:00
parent 098a271d7c 30d89be2d8
commit 08ea4b35eb
14 changed files with 31 additions and 19 deletions
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -4,7 +4,8 @@
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <%=render "layouts/tracking_data"%>
+    <%= render "layouts/tracking_data" %>
+    <%= render "layouts/meta_tags" %>
    <title><%= content_for?(:title) ? yield(:title) : setting['org_name'] %></title>
    <%= stylesheet_link_tag    "application" %>
    <!--[if lt IE 9]>