diff options
| author | Jonne Haß <me@jhass.eu> | 2014-10-08 12:47:18 +0400 |
|---|---|---|
| committer | Jonne Haß <me@jhass.eu> | 2014-10-08 12:47:18 +0400 |
| commit | cf6b14471271bd16acb65ceebe91aafbd3e1c507 (patch) | |
| tree | 08e449b48519aa541a7805344babf861a596fb42 /app | |
| parent | 4cfe3d7005679a705450362fab4f13002f2fcb81 (diff) | |
| parent | fce957443e2d6454b00a8440dab61064f7969023 (diff) | |
Merge pull request #5310 from strivedi183/5194-replace_jqueryidletimerjs_vendored_asset_with_bower_package
Replaced jquery.idle-timer.js vendored asset with bower package
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/main.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index b0ae002b8..d683db631 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -17,7 +17,7 @@ //= require jquery.events.input //= require jquery.elastic //= require jquery.mentionsInput -//= require jquery.idle-timer +//= require jquery-idletimer/dist/idle-timer //= require jquery.infinitescroll-custom //= require jquery.autocomplete-custom //= require keycodes |