Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

a983c0e2

Commit a983c0e2 authored 9 years ago by Rodrigo Nascimento

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into jshint

parents 176899ad 81ade7ca

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

i18n/en.i18n.json 5 additions, 1 deletion

i18n/en.i18n.json
packages/rocketchat-theme/assets/stylesheets/base.less 10 additions, 0 deletions

packages/rocketchat-theme/assets/stylesheets/base.less
packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less 4 additions, 0 deletions

...etchat-theme/assets/stylesheets/utils/_colors.import.less
packages/rocketchat-ui-account/account/accountPreferences.html 1 addition, 0 deletions

...ges/rocketchat-ui-account/account/accountPreferences.html
packages/rocketchat-ui-account/account/accountProfile.coffee 20 additions, 0 deletions

packages/rocketchat-ui-account/account/accountProfile.coffee
packages/rocketchat-ui-account/account/accountProfile.html 10 additions, 0 deletions

packages/rocketchat-ui-account/account/accountProfile.html

with 50 additions and 1 deletion

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