Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to meteor 1.6.1 #9546

Merged
merged 13 commits into from
Feb 15, 2018
Merged

Update to meteor 1.6.1 #9546

merged 13 commits into from
Feb 15, 2018

Conversation

engelgabriel
Copy link
Member

@engelgabriel engelgabriel commented Jan 30, 2018 •
edited
Loading

Re-enable:

  • rocketchat:graphql
  • rocketchat:internal-hubot
  • steffo:meteor-accounts-saml

@engelgabriel engelgabriel added this to the 0.62.0 milestone Jan 30, 2018
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-9546 January 30, 2018 05:42 Inactive
@engelgabriel
Copy link
Member Author

Maybe we need to do #9545 first

@engelgabriel engelgabriel mentioned this pull request Jan 30, 2018
Closed
@sampaiodiego
Copy link
Member

awesome release

@rodrigok
Copy link
Member

@engelgabriel why did you delete some i18n files?

@engelgabriel
Copy link
Member Author

@rodrigok I finihed deleting the /app/ directory, since @sampaiodiego moved it to /.app/

@engelgabriel
Merge branch 'develop' into meteor-1.6.1
637a345 
# Conflicts:
#	.meteor/versions
#	package-lock.json
#	packages/rocketchat-livechat/app/package-lock.json
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-9546 February 2, 2018 15:48 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-9546 February 2, 2018 17:05 Inactive
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-9546 February 9, 2018 15:23 Inactive
@engelgabriel
Merge branch 'develop' into meteor-1.6.1
8049ac6 
# Conflicts:
#	package-lock.json
#	package.json
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-9546 February 14, 2018 20:23 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-9546 February 14, 2018 20:24 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-9546 February 14, 2018 22:52 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-9546 February 14, 2018 23:04 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-9546 February 14, 2018 23:06 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-9546 February 15, 2018 01:32 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-9546 February 15, 2018 13:07 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-9546 February 15, 2018 14:22 Inactive
@engelgabriel engelgabriel changed the title [WIP] update to meteor 1.6.1 Update to meteor 1.6.1 Feb 15, 2018
@rodrigok rodrigok merged commit d8e1524 into develop Feb 15, 2018
@rodrigok rodrigok deleted the meteor-1.6.1 branch February 15, 2018 19:15
@rodrigok rodrigok mentioned this pull request Feb 28, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rodrigok rodrigok rodrigok approved these changes

@sampaiodiego sampaiodiego Awaiting requested review from sampaiodiego

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.62.0
Development

Successfully merging this pull request may close these issues.
3 participants
@engelgabriel @sampaiodiego @rodrigok