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

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

Merged
merged 3 commits into from
Jul 27, 2017
Merged

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

merged 3 commits into from
Jul 27, 2017

Commits on Jul 27, 2017

  1. Fix admin room list show the correct i18n type

    @ccfang
    ccfang committed Jul 27, 2017
    Configuration menu
    Copy the full SHA
    7118822 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into fix-admin-roomlist… 

    …-i18n-type

# Conflicts:
#	.docker/Dockerfile
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	package.json
#	packages/rocketchat-lib/rocketchat.info
    @rodrigok
    rodrigok committed Jul 27, 2017
    Configuration menu
    Copy the full SHA
    8131516 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into fix-admin-roomlist… 

    …-i18n-type

# Conflicts:
#	.docker/Dockerfile
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	package.json
#	packages/rocketchat-lib/rocketchat.info
    @rodrigok
    rodrigok committed Jul 27, 2017
    Configuration menu
    Copy the full SHA
    4d5f35c View commit details
    Browse the repository at this point in the history