Skip to content
Snippets Groups Projects
Commit f7476cba authored by joseconsuegra's avatar joseconsuegra Committed by GitHub
Browse files

Merge branch 'develop' into patch-1

parents 1ef2d33d 78015b2a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
packages/rocketchat-file/.npm/package/npm-shrinkwrap.json
+ 69
− 33
View file @ f7476cba
{ {
"dependencies": { "dependencies": {
"array-parallel": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz",
"from": "array-parallel@>=0.1.3 <0.2.0"
},
"array-series": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz",
"from": "array-series@>=0.1.5 <0.2.0"
},
"cross-spawn": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.0.tgz",
"from": "cross-spawn@>=4.0.0 <5.0.0"
},
"debug": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
"from": "debug@>=2.2.0 <2.3.0"
},
"flushwritable": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/flushwritable/-/flushwritable-1.0.0.tgz",
"from": "flushwritable@>=1.0.0 <2.0.0"
},
"gm": { "gm": {
"version": "1.18.1", "version": "1.23.0",
"resolved": "https://registry.npmjs.org/gm/-/gm-1.18.1.tgz", "resolved": "https://registry.npmjs.org/gm/-/gm-1.23.0.tgz",
"from": "gm@1.18.1", "from": "gm@1.23.0"
"dependencies": {
"array-parallel": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz",
"from": "array-parallel@0.1.3"
},
"array-series": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz",
"from": "array-series@0.1.5"
},
"debug": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
"from": "debug@2.2.0",
"dependencies": {
"ms": {
"version": "0.7.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
"from": "ms@0.7.1"
}
}
}
}
}, },
"gridfs-stream": { "gridfs-stream": {
"version": "0.5.3", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.5.3.tgz", "resolved": "https://registry.npmjs.org/gridfs-stream/-/gridfs-stream-1.1.1.tgz",
"from": "gridfs-stream@0.5.3" "from": "gridfs-stream@1.1.1"
},
"isexe": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz",
"from": "isexe@>=1.1.1 <2.0.0"
},
"lru-cache": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz",
"from": "lru-cache@>=4.0.1 <5.0.0"
},
"minimist": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
"from": "minimist@0.0.8"
}, },
"mkdirp": { "mkdirp": {
"version": "0.3.5", "version": "0.5.1",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"from": "mkdirp@0.3.5" "from": "mkdirp@0.5.1"
},
"ms": {
"version": "0.7.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
"from": "ms@0.7.1"
},
"pseudomap": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
"from": "pseudomap@>=1.0.1 <2.0.0"
},
"which": {
"version": "1.2.11",
"resolved": "https://registry.npmjs.org/which/-/which-1.2.11.tgz",
"from": "which@>=1.2.9 <2.0.0"
},
"yallist": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz",
"from": "yallist@>=2.0.0 <3.0.0"
} }
} }
} }
packages/rocketchat-file/package.js
+ 3
− 3
View file @ f7476cba
...@@ -16,7 +16,7 @@ Package.onUse(function(api) { ...@@ -16,7 +16,7 @@ Package.onUse(function(api) {
}); });
Npm.depends({ Npm.depends({
'mkdirp': '0.3.5', 'mkdirp': '0.5.1',
'gridfs-stream': '0.5.3', 'gridfs-stream': '1.1.1',
'gm': '1.18.1' 'gm': '1.23.0'
}); });
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment