diff options
| author | Marc Florisson | 2014-08-26 10:55:46 +0200 |
|---|---|---|
| committer | Marc Florisson | 2014-08-26 10:55:46 +0200 |
| commit | b704ad8adbb208a406efe479c176b332d203bc54 (patch) | |
| tree | ec375d97707dd7c19c4cf97d2ad6d1138c714bf5 /app/assets/javascripts/application.js | |
| parent | 286912a0e775a0fbc85943460046f47ef022ec35 (diff) | |
| parent | 1d932f4357109fa8f3d36a4fb3f2fd3ff4093300 (diff) | |
| download | chouette-core-b704ad8adbb208a406efe479c176b332d203bc54.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b20582b76..5b03dce78 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,7 +12,7 @@ //= require raphael //= require morris //= require bootstrap -//= require twitter/typeahead.min +//= require typeahead.min //= require bootstrap-timepicker //= require tagmanager //= require_directory ./plugins |