Merge branch 'jgiannuzzi-actually-fix-infinite-scroll'

stable
David Barragán Merino 2016-10-13 17:55:24 +02:00
commit d059b84671
2 changed files with 2 additions and 2 deletions

View File

@ -69,7 +69,7 @@
"angular-translate-loader-partial": "~2.10.0", "angular-translate-loader-partial": "~2.10.0",
"angular-translate-loader-static-files": "~2.10.0", "angular-translate-loader-static-files": "~2.10.0",
"angular-translate-interpolation-messageformat": "~2.10.0", "angular-translate-interpolation-messageformat": "~2.10.0",
"ngInfiniteScroll": "^1.3.1", "ng-infinite-scroll-npm-is-better-than-bower": "^1.3.0",
"immutable": "~3.8.1", "immutable": "~3.8.1",
"bluebird": "~3.3.5", "bluebird": "~3.3.5",
"intro.js": "~2.1.0", "intro.js": "~2.1.0",

View File

@ -176,7 +176,7 @@ paths.libs = [
paths.vendor + "raven-js/dist/raven.js", paths.vendor + "raven-js/dist/raven.js",
paths.vendor + "l.js/l.js", paths.vendor + "l.js/l.js",
paths.vendor + "messageformat/locale/*.js", paths.vendor + "messageformat/locale/*.js",
paths.vendor + "ngInfiniteScroll/dist/ng-infinite-scroll.js", paths.vendor + "ng-infinite-scroll-npm-is-better-than-bower/build/ng-infinite-scroll.js",
paths.vendor + "immutable/dist/immutable.js", paths.vendor + "immutable/dist/immutable.js",
paths.vendor + "intro.js/intro.js", paths.vendor + "intro.js/intro.js",
paths.vendor + "dragula.js/dist/dragula.js", paths.vendor + "dragula.js/dist/dragula.js",