diff options
| author | Azul <azul@leap.se> | 2012-10-17 16:02:33 +0200 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-10-17 16:02:33 +0200 |
| commit | d9a510fa2126c29f0af58c6bbeff35802777eee6 (patch) | |
| tree | 9e784338d95fc5d3e0b29f8083a07de43f2a1f53 /app/assets/javascripts/application.js | |
| parent | 0c79df9874c59fbaa5c845e07d8fa1b4bbc23b9c (diff) | |
| parent | dc0584f7d993ef7c75fbdd9d341ebb3337f3448d (diff) | |
Merge branch 'feature-authentication_system' into develop
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 a0b89db..dc975d4 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -15,3 +15,4 @@ //= require srp //= require users //= require_tree . +//= require bootstrap |