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.

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

Develop sync #7500

Merged
merged 8 commits into from
Jul 24, 2017
Merged

Develop sync #7500

merged 8 commits into from
Jul 24, 2017

Conversation

rodrigok
Copy link
Member

No description provided.

Qi Yin and others added 8 commits May 26, 2017 17:35
add server methods getRoomNameById
# Conflicts:
#	.docker/Dockerfile
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	package.json
#	packages/rocketchat-lib/rocketchat.info
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-7500 July 14, 2017 18:42 Inactive
@geekgonecrazy
Copy link
Contributor

@rodrigok Any way this can go out with next release?

Looks like: #7102 targeted master so didn't make it in 0.57.1 or 0.57.2 so the method getRoomNameById doesn't exist

Related to: RocketChat/hubot-rocketchat#225

@rodrigok
Copy link
Member Author

@geekgonecrazy Are you sure it was not in the .2 release? Cuz the release was made from master

@geekgonecrazy
Copy link
Contributor

geekgonecrazy commented Jul 14, 2017

😂 disregard :) You are right!

@rodrigok
Copy link
Member Author

@geekgonecrazy Can you aprove this PR?

@sampaiodiego
Copy link
Member

sampaiodiego commented Jul 14, 2017

where is 0.57.2 release notes? looks like they are not coming to develop

@sampaiodiego sampaiodiego merged commit e36ed3c into develop Jul 24, 2017
@rodrigok rodrigok deleted the develop-sync branch July 25, 2017 22:07
@engelgabriel engelgabriel modified the milestone: 0.58.0 Jul 27, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants