diff options
| author | jessib <jessib@leap.se> | 2013-07-09 11:53:58 -0700 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-07-09 11:53:58 -0700 |
| commit | 09b7f01cac6df1ae11f4129b20b781b78a3706ac (patch) | |
| tree | 3921eaa5edd03d80e6b402c5c2f88dda6338ab3a /app/assets/javascripts | |
| parent | 9979b50848ce27730f880159512933e50d5ae0e4 (diff) | |
| parent | 3113f8b814417a896ad5340fda88927733f8ab22 (diff) | |
Merge branch 'master' into feature/authentication_generic_error
Conflicts:
app/views/layouts/_messages.html.haml
app/views/layouts/application.html.haml
users/app/assets/javascripts/users.js.coffee
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/application.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 049a392..cd90934 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,11 +14,10 @@ //= require jquery_ujs //= require srp //= require bootstrap -//= require bootstrap-editable -//= require bootstrap-editable-rails //= require rails.validations //= require rails.validations.simple_form +//= require leap //= require tickets //= require users |