Skip to content

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

Merged
rodrigok merged 3 commits into
RocketChat:developfrom
ccfang:fix-admin-roomlist-i18n-type
Jul 27, 2017
Merged

[FIX] Fix admin room list show the correct i18n type#7582
rodrigok merged 3 commits into
RocketChat:developfrom
ccfang:fix-admin-roomlist-i18n-type

Conversation

@ccfang
Copy link
Copy Markdown
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
rodrigok added 2 commits July 27, 2017 15:08
…-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