Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

2e4ef5bc

Commit 2e4ef5bc authored 9 years ago by Diego Sampaio

Downloads
- Plain Diff

Merge branch 'develop' into fix-message-notifications

parents 2b5d7e2b 1f7bc1bf

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

i18n/en.i18n.json 5 additions, 0 deletions

i18n/en.i18n.json
packages/rocketchat-ldap/server/loginHandler.js 22 additions, 5 deletions

packages/rocketchat-ldap/server/loginHandler.js
packages/rocketchat-ui-account/account/accountPreferences.coffee 7 additions, 0 deletions

...s/rocketchat-ui-account/account/accountPreferences.coffee
packages/rocketchat-ui-account/account/accountPreferences.html 9 additions, 0 deletions

...ges/rocketchat-ui-account/account/accountPreferences.html
server/methods/saveUserPreferences.coffee 3 additions, 0 deletions

server/methods/saveUserPreferences.coffee

with 46 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