Skip to content

Commit

Permalink
Merge pull request #8273 from RocketChat/meteor-update
Browse files Browse the repository at this point in the history
Deps update
  • Loading branch information
rodrigok authored Sep 25, 2017
2 parents c7ce346 + 8e931e9 commit fee446a
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accounts-base@1.3.2
accounts-base@1.3.3
accounts-facebook@1.2.1
accounts-github@1.3.0
accounts-google@1.2.0
Expand Down Expand Up @@ -26,7 +26,7 @@ coffeescript@1.12.7_1
coffeescript-compiler@1.12.7_1
dandv:caret-position@2.1.1
ddp@1.3.1
ddp-client@2.1.2
ddp-client@2.1.3
ddp-common@1.2.9
ddp-rate-limiter@1.0.7
ddp-server@2.0.2
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"babel-plugin-array-includes": "^2.0.3",
"chimp": "^0.50.0",
"conventional-changelog-cli": "^1.3.3",
"eslint": "^4.7.1",
"eslint": "^4.7.2",
"mock-require": "^2.0.2",
"postcss-cssnext": "^2.11.0",
"postcss-smart-import": "^0.7.5",
Expand All @@ -103,13 +103,13 @@
"underscore.string": "^3.3.4"
},
"dependencies": {
"@google-cloud/storage": "^1.2.1",
"aws-sdk": "^2.118.0",
"@google-cloud/storage": "^1.3.0",
"aws-sdk": "^2.122.0",
"babel-runtime": "^6.26.0",
"bcrypt": "^1.0.3",
"codemirror": "^5.29.0",
"codemirror": "^5.30.0",
"emailreplyparser": "0.0.5",
"file-type": "^6.1.0",
"file-type": "^6.2.0",
"highlight.js": "^9.12.0",
"imap": "^0.8.19",
"jquery": "^3.2.1",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/rocketchat-livechat/app/.meteor/versions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accounts-base@1.3.2
accounts-base@1.3.3
accounts-password@1.4.0
aldeed:simple-schema@1.5.3
allow-deny@1.0.9
Expand All @@ -17,7 +17,7 @@ check@1.2.5
coffeescript@1.12.7_1
coffeescript-compiler@1.12.7_1
ddp@1.3.1
ddp-client@2.1.2
ddp-client@2.1.3
ddp-common@1.2.9
ddp-rate-limiter@1.0.7
ddp-server@2.0.2
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-ui/.npm/package/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
7 changes: 7 additions & 0 deletions packages/rocketchat-ui/.npm/package/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
This directory and the files immediately inside it are automatically generated
when you change this package's NPM dependencies. Commit the files in this
directory (npm-shrinkwrap.json, .gitignore, and this README) to source control
so that others run the same versions of sub-dependencies.

You should NOT check in the node_modules directory that Meteor automatically
creates; if you are using git, the .gitignore file tells git to ignore it.
29 changes: 29 additions & 0 deletions packages/rocketchat-ui/.npm/package/npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit fee446a

Please sign in to comment.