diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-07 22:35:45 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-07 22:35:45 +0300 |
| commit | c2a8daf9928439114ed4125577d376b76460d023 (patch) | |
| tree | e61ec1e8480f5e51c779c310788ef401efb47fcd /app/assets/javascripts/commons | |
| parent | 60bc0fc16900316ff22b83c6de3b358767d838b9 (diff) | |
| parent | 1e39b51a8a32ea469838fc473d41c8b04c2f935a (diff) | |
Merge branch '15664-remove-jquery-nicescroll' into 'master'
Resolve "Remove jQuery Nicescroll"
Closes #15664, #30860, and #35885
See merge request !13262
Diffstat (limited to 'app/assets/javascripts/commons')
| -rw-r--r-- | app/assets/javascripts/commons/jquery.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/javascripts/commons/jquery.js b/app/assets/javascripts/commons/jquery.js index b53f6284afc..b93e94a3c97 100644 --- a/app/assets/javascripts/commons/jquery.js +++ b/app/assets/javascripts/commons/jquery.js @@ -6,6 +6,5 @@ import 'vendor/jquery.endless-scroll'; import 'vendor/jquery.caret'; import 'vendor/jquery.atwho'; import 'vendor/jquery.scrollTo'; -import 'vendor/jquery.nicescroll'; import 'vendor/jquery.waitforimages'; import 'select2/select2'; |