Merge branch 'franceconnect_local' into develop

# Conflicts: # app/assets/javascripts/application.js
2016-01-29 11:43:31 +01:00 · 2016-01-29 11:43:31 +01:00 · 8ca2b53775
commit 8ca2b53775
parent eda863a7b2 35994059f6
7 changed files with 301 additions and 2 deletions
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@ -4,7 +4,6 @@
    %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
    %title TPS - Téléprocédures simplifiées
    %meta{'http-equiv' => "X-UA-Compatible", :content => "IE=edge"}
-    %script{src: 'http://fcp.integ01.dev-franceconnect.fr/js/franceconnect.js'}

    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
    = javascript_include_tag 'application', 'data-turbolinks-track' => true