Develop sync #7500
Merged
Develop sync #7500
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
add server methods getRoomNameById
[FIX] Message being displayed unescaped
Run avatar migration on startup
# Conflicts: # .docker/Dockerfile # .sandstorm/sandstorm-pkgdef.capnp # .travis/snap.sh # package.json # packages/rocketchat-lib/rocketchat.info
|
@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 |
|
@geekgonecrazy Are you sure it was not in the .2 release? Cuz the release was made from master |
|
😂 disregard :) You are right! |
|
@geekgonecrazy Can you aprove this PR? |
geekgonecrazy
approved these changes
Jul 14, 2017
|
where is |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.