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

[FIX] Fix admin room list show the correct i18n type #7582

Merged
merged 3 commits into from
Jul 27, 2017

Conversation

ccfang
Copy link
Contributor

@ccfang ccfang commented Jul 27, 2017

@RocketChat/core

Just a simple modification

@engelgabriel engelgabriel added this to the 0.58.0 milestone Jul 27, 2017
@rodrigok rodrigok changed the base branch from master to develop July 27, 2017 17:09
…-i18n-type

# Conflicts:
#	.docker/Dockerfile
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	package.json
#	packages/rocketchat-lib/rocketchat.info
…-i18n-type

# Conflicts:
#	.docker/Dockerfile
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	package.json
#	packages/rocketchat-lib/rocketchat.info
@rodrigok rodrigok merged commit 513401a into RocketChat:develop Jul 27, 2017
@ccfang ccfang deleted the fix-admin-roomlist-i18n-type branch July 28, 2017 06:38
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.

3 participants