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 /help/app/assets/javascripts/tickets.js | |
| 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 'help/app/assets/javascripts/tickets.js')
| -rw-r--r-- | help/app/assets/javascripts/tickets.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/help/app/assets/javascripts/tickets.js b/help/app/assets/javascripts/tickets.js index 5376a6e..bf7965c 100644 --- a/help/app/assets/javascripts/tickets.js +++ b/help/app/assets/javascripts/tickets.js @@ -1,4 +1,4 @@ -$(document).ready(function () { - $.fn.editable.defaults.mode = 'inline'; - $('#title').editable(); -});
\ No newline at end of file +//$(document).ready(function () { +// $.fn.editable.defaults.mode = 'inline'; +// $('#title').editable(); +//});
\ No newline at end of file |