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/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@ -26,6 +26,7 @@
 //= require leaflet.freedraw
 //= require smart_listing
 //= require turf
+//= require franceconnect

 $(document).ready(function() {
    $('.js-scrollTo').on('click', function() { // Au clic sur un élément