diff options
| author | Thomas Haddad | 2017-01-30 16:31:36 +0100 |
|---|---|---|
| committer | Thomas Haddad | 2017-01-30 16:31:36 +0100 |
| commit | c9d8a8e34ea5fec55eb2c8c4b137d7c31752db45 (patch) | |
| tree | b5b05c7aa69fad4c495269444e94fb5e316a23d7 /app/assets/javascripts/application.js | |
| parent | 8ce5d4f67210990e22a716b82a7d3fb634d80fa9 (diff) | |
| parent | dd6d75b90a610b100f4a8b9eb14b8811b19e9d33 (diff) | |
| download | chouette-core-c9d8a8e34ea5fec55eb2c8c4b137d7c31752db45.tar.bz2 | |
Merge branch 'itineraries_ol'
Diffstat (limited to 'app/assets/javascripts/application.js')
| -rw-r--r-- | app/assets/javascripts/application.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 835a716e4..eeca98190 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -10,6 +10,7 @@ //= require jquery-ui //= require modernizr //= require cocoon +//= require_directory ./OpenLayers //= require bootstrap-sass-official //= require select2-full //= require select2_locale_fr |