Merge branch 'jgiannuzzi-fix-infinite-scroll'
commit
91e5325918
|
@ -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.0",
|
"ngInfiniteScroll": "^1.3.1",
|
||||||
"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",
|
||||||
|
|
|
@ -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/build/ng-infinite-scroll.js",
|
paths.vendor + "ngInfiniteScroll/dist/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",
|
||||||
|
|
Loading…
Reference in New Issue