Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

6354f576

Unverified Commit 6354f576 authored 6 years ago by Diego Sampaio

Downloads
- Plain Diff

Merge branch 'develop' into release-0.63.1

parents beef7afe c29fd84b

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.eslintrc 1 addition, 0 deletions

.eslintrc
.snapcraft/snapcraft.yaml 2 additions, 2 deletions

.snapcraft/snapcraft.yaml
packages/meteor-accounts-saml/saml_server.js 1 addition, 1 deletion

packages/meteor-accounts-saml/saml_server.js
packages/meteor-accounts-saml/saml_utils.js 1 addition, 1 deletion

packages/meteor-accounts-saml/saml_utils.js
packages/rocketchat-i18n/i18n/de.i18n.json 1 addition, 1 deletion

packages/rocketchat-i18n/i18n/de.i18n.json
packages/rocketchat-i18n/i18n/fr.i18n.json 2 additions, 2 deletions

packages/rocketchat-i18n/i18n/fr.i18n.json
packages/rocketchat-ui-account/client/accountPreferences.js 5 additions, 1 deletion

packages/rocketchat-ui-account/client/accountPreferences.js

with 13 additions and 8 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