Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

6f5209d8

Commit 6f5209d8 authored 9 years ago by Marcelo Schmidt

Downloads
- Plain Diff

Merge branch 'develop' into fix-oauth-unverified-email-registration

Conflicts:
	HISTORY.md

parents 0f60d14d 0e7dfcb6

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

HISTORY.md 4 additions, 0 deletions

HISTORY.md
i18n/en.i18n.json 1 addition, 0 deletions

i18n/en.i18n.json
packages/rocketchat-lib/server/startup/settings.coffee 1 addition, 1 deletion

packages/rocketchat-lib/server/startup/settings.coffee
packages/rocketchat-ui-account/account/accountPreferences.coffee 2 additions, 2 deletions

...s/rocketchat-ui-account/account/accountPreferences.coffee
server/lib/accounts.coffee 2 additions, 1 deletion

server/lib/accounts.coffee
server/methods/channelsList.coffee 1 addition, 1 deletion

server/methods/channelsList.coffee

with 11 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment