Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

3d8766a7

Commit 3d8766a7 authored 9 years ago by sweetvvck

Downloads
- Plain Diff

Merge branch 'develop' into feature/app-language-setting

parents 7e9fa0a3 21509fd3

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

i18n/en.i18n.json 3 additions, 3 deletions

i18n/en.i18n.json
packages/rocketchat-integrations/server/api/api.coffee 1 addition, 1 deletion

packages/rocketchat-integrations/server/api/api.coffee
packages/rocketchat-theme/assets/stylesheets/base.less 3 additions, 0 deletions

packages/rocketchat-theme/assets/stylesheets/base.less
packages/rocketchat-theme/i18n/en.i18n.json 2 additions, 1 deletion

packages/rocketchat-theme/i18n/en.i18n.json
packages/rocketchat-theme/server/variables.coffee 1 addition, 0 deletions

packages/rocketchat-theme/server/variables.coffee

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