Skip to content

Commit

Permalink
Merge pull request #6706 from RocketChat/meteor-1.4.4
Browse files Browse the repository at this point in the history
meteor update to 1.4.4
  • Loading branch information
engelgabriel committed Apr 18, 2017
2 parents 9b07d7a + 16c704a commit 6742e80
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 28 deletions.
10 changes: 5 additions & 5 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
rocketchat:cors
accounts-facebook@1.1.1
accounts-github@1.2.1
accounts-google@1.1.1
accounts-google@1.1.2
accounts-meteor-developer@1.2.1
accounts-password@1.3.4
accounts-twitter@1.2.1
blaze-html-templates
check@1.2.5
coffeescript@1.11.1_4
ddp-rate-limiter@1.0.7
ecmascript@0.6.3
ecmascript@0.7.2
ejson@1.0.13
email@=1.1.18
email@1.1.18
fastclick@1.0.13
http@1.2.12
jquery@1.11.10
Expand All @@ -26,7 +26,7 @@ meteor-base@1.0.4
mobile-experience@1.0.4
mongo@1.1.16
random@1.0.10
rate-limit@1.0.7
rate-limit@1.0.8
reactive-dict@1.1.8
reactive-var@1.0.11
reload@1.1.11
Expand All @@ -35,7 +35,7 @@ session@1.1.7
shell-server@0.2.3
spacebars
standard-minifier-css@1.3.4
standard-minifier-js@1.2.3
standard-minifier-js@2.0.0
tracker@1.1.2

rocketchat:2fa
Expand Down
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.4.3.2
METEOR@1.4.4.1
16 changes: 8 additions & 8 deletions .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ accounts-github@1.2.1
accounts-google@1.1.2
accounts-meteor-developer@1.2.1
accounts-oauth@1.1.15
accounts-password@1.3.4
accounts-password@1.3.5
accounts-twitter@1.2.1
aldeed:simple-schema@1.5.3
allow-deny@1.0.5
autoupdate@1.3.12
babel-compiler@6.18.1
babel-compiler@6.18.2
babel-runtime@1.0.1
base64@1.0.10
binary-heap@1.0.10
Expand All @@ -33,18 +33,18 @@ deepwell:bootstrap-datepicker2@1.3.0
deps@1.0.12
diff-sequence@1.0.7
dispatch:run-as-user@1.1.1
ecmascript@0.7.2
ecmascript@0.7.3
ecmascript-runtime@0.3.15
edgee:slingshot@0.7.1
ejson@1.0.13
email@1.1.18
email@1.2.1
emojione:emojione@2.2.6
facebook-oauth@1.3.0
fastclick@1.0.13
francocatena:status@1.5.3
geojson-utils@1.0.10
github-oauth@1.2.0
google-oauth@1.2.1
google-oauth@1.2.3
hot-code-push@1.0.4
html-tools@1.0.11
htmljs@1.0.11
Expand Down Expand Up @@ -80,13 +80,13 @@ meteorhacks:inject-initial@1.0.4
meteorhacks:meteorx@1.4.1
meteorspark:util@0.2.0
minifier-css@1.2.16
minifier-js@1.2.18
minifier-js@2.0.0
minimongo@1.0.21
mizzao:autocomplete@0.5.1
mizzao:timesync@0.3.4
mobile-experience@1.0.4
mobile-status-bar@1.0.14
modules@0.8.1
modules@0.8.2
modules-runtime@0.7.10
mongo@1.1.16
mongo-id@1.0.6
Expand Down Expand Up @@ -233,7 +233,7 @@ spacebars@1.0.15
spacebars-compiler@1.1.2
srp@1.0.10
standard-minifier-css@1.3.4
standard-minifier-js@1.2.3
standard-minifier-js@2.0.0
steffo:meteor-accounts-saml@0.0.1
tap:i18n@1.8.2
templating@1.3.2
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"babel-runtime": "^6.23.0",
"bcrypt": "^1.0.2",
"codemirror": "^5.25.0",
"file-type": "^4.1.0",
"file-type": "^4.2.0",
"highlight.js": "^9.10.0",
"jquery": "^3.2.1",
"mime-db": "^1.27.0",
Expand Down

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

8 changes: 4 additions & 4 deletions packages/rocketchat-livechat/app/.meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# but you can also edit it by hand.

meteor@1.6.1
webapp@1.3.14
webapp@1.3.15
logging@1.1.17
tracker@1.1.2
deps@1.0.12
Expand All @@ -32,11 +32,11 @@ underscorestring:underscore.string
momentjs:moment
mizzao:timesync
reactive-var@1.0.11
accounts-password@1.3.4
accounts-password@1.3.5
tap:i18n
smoral:sweetalert
ecmascript@0.6.3
ecmascript@0.7.2
es5-shim@4.6.15
standard-minifier-css@1.3.4
standard-minifier-js@1.2.3
standard-minifier-js@2.0.0
shell-server@0.2.3
2 changes: 1 addition & 1 deletion packages/rocketchat-livechat/app/.meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.4.3.2
METEOR@1.4.4.1
12 changes: 6 additions & 6 deletions packages/rocketchat-livechat/app/.meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ accounts-base@1.2.16
accounts-password@1.3.5
aldeed:simple-schema@1.5.3
allow-deny@1.0.5
babel-compiler@6.18.1
babel-compiler@6.18.2
babel-runtime@1.0.1
base64@1.0.10
binary-heap@1.0.10
Expand All @@ -22,10 +22,10 @@ ddp-rate-limiter@1.0.7
ddp-server@1.3.14
deps@1.0.12
diff-sequence@1.0.7
ecmascript@0.7.2
ecmascript@0.7.3
ecmascript-runtime@0.3.15
ejson@1.0.13
email@1.2.0
email@1.2.1
es5-shim@4.6.15
geojson-utils@1.0.10
html-tools@1.0.11
Expand All @@ -44,10 +44,10 @@ mdg:validation-error@0.5.1
meteor@1.6.1
meteorspark:util@0.2.0
minifier-css@1.2.16
minifier-js@1.2.18
minifier-js@2.0.0
minimongo@1.0.21
mizzao:timesync@0.5.0
modules@0.8.1
modules@0.8.2
modules-runtime@0.7.10
momentjs:moment@2.18.1
mongo@1.1.16
Expand All @@ -74,7 +74,7 @@ spacebars@1.0.15
spacebars-compiler@1.1.2
srp@1.0.10
standard-minifier-css@1.3.4
standard-minifier-js@1.2.3
standard-minifier-js@2.0.0
tap:i18n@1.8.2
templating@1.3.2
templating-compiler@1.3.2
Expand Down

0 comments on commit 6742e80

Please sign in to comment.