Merge branch 'develop' into develop_v2

# Conflicts: # Gemfile.lock # db/schema.rb
2016-11-17 16:55:41 +01:00 · 2016-11-17 16:55:41 +01:00 · 647eaa4ba8
commit 647eaa4ba8
parent 6a261d125a d75a53ffae
34 changed files with 509 additions and 122 deletions
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@ -53,6 +53,6 @@

            =link_to 'Contact', "mailto:"+t('dynamics.contact_email')

-
+    = render partial: 'layouts/google_analytics'