diff options
| author | Michel Etienne | 2014-08-27 15:44:05 +0200 |
|---|---|---|
| committer | Michel Etienne | 2014-08-27 15:44:05 +0200 |
| commit | 4ff26e0096f122dc74b45b427137eb631da3fd06 (patch) | |
| tree | 8a9717bca9f5d05ff529462d6c8d7758e363eeb2 /app/assets/javascripts/application.js | |
| parent | 2a1b23c9bd1d4e2e97814ea9190892f2981b365d (diff) | |
| parent | 82cf451ad0faa76a26adc27528f4458596157802 (diff) | |
| download | chouette-core-4ff26e0096f122dc74b45b427137eb631da3fd06.tar.bz2 | |
Merge branch 'sismo' of github.com:afimb/chouette2 into sismo
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 f8f6c6d1f..5b03dce78 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -18,3 +18,4 @@ //= require_directory ./plugins //= require_directory . //= require_directory ./stop_areas +//= require_directory ./vehicle_journeys |