Merge branch 'master' into staging

1 files changed, 1 insertions, 16 deletions

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index eeca98190..3bce3ec7d 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -7,32 +7,17 @@
 //= require turbolinks
 //= require jquery
 //= require jquery_ujs
-//= require jquery-ui
 //= require modernizr
 //= require cocoon
-//= require_directory ./OpenLayers
+//= require  ./OpenLayers/ol.js
 //= require bootstrap-sass-official
 //= require select2-full
 //= require select2_locale_fr
-//= require typeahead.js
 //= require jquery-tokeninput
-//= require moment
-//= require moment/locale/fr
-//= require eonasdan-bootstrap-datetimepicker
 //= require tagmanager
 //= require footable
 //= require footable/footable.filter
 //= require footable/footable.paginate
 //= require footable/footable.sort
-//= require tools
 //= require_directory ./plugins
 //= require_directory .
-//= require_directory ./stop_areas
-//= require_directory ./vehicle_journeys
-//= require_directory ./vehicle_journey_frequencies
-//= require_directory ./import_tasks
-//= require_directory ./compliance_check_tasks
-//= require_directory ./export_tasks
-//= require_directory ./exports
-//= require_directory ./lines
-//= require_directory ./partials