diff options
| author | Michel Etienne | 2014-11-05 11:51:10 +0100 |
|---|---|---|
| committer | Michel Etienne | 2014-11-05 11:51:10 +0100 |
| commit | 0906ff71269c2bcec1a6445a6fb53900be66be9b (patch) | |
| tree | 873ecea902e1ace619ce872ba90f2c876e3251d4 /app/assets/javascripts/application.js | |
| parent | c828656898b1bc728e6fa89c4d527fd009dc7777 (diff) | |
| parent | 2b86d2428d5da8be4499fc1fec2976f6c70fa34e (diff) | |
| download | chouette-core-0906ff71269c2bcec1a6445a6fb53900be66be9b.tar.bz2 | |
Merge branch 'sismo' into gtfs_v2
Diffstat (limited to 'app/assets/javascripts/application.js')
| -rw-r--r-- | app/assets/javascripts/application.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index ed6e05c4c..01142c849 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,7 +13,9 @@ //= require morris //= require bootstrap-sass-official //= require typeahead.js -//= require bootstrap-timepicker +//= require moment +//= require moment/locale/fr +//= require eonasdan-bootstrap-datetimepicker //= require tagmanager //= require_directory ./plugins //= require_directory . |