diff options
| author | Michel Etienne | 2014-06-23 16:43:17 +0200 |
|---|---|---|
| committer | Michel Etienne | 2014-06-23 16:43:17 +0200 |
| commit | 3d046b1a470712836a2bfe15f0be46cd8cc5c73b (patch) | |
| tree | 429cbfa360f58b783121462a2b4e558516a433ee /app/assets/javascripts/application.js | |
| parent | 37e22fbf5633666fbd2fb29c2fb9a7379c772e11 (diff) | |
| parent | 3988cf436bd2a751b3f229eaeebe0e2f371f6774 (diff) | |
| download | chouette-core-3d046b1a470712836a2bfe15f0be46cd8cc5c73b.tar.bz2 | |
Merge branch 'master' of github.com:afimb/chouette2
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 6b7b38a3a..fa99d193c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -11,4 +11,5 @@ //= require cocoon //= require raphael //= require morris +//= require bootstrap //= require_directory . |