Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

bd85f1ca

Commit bd85f1ca authored 9 years ago by Gabriel Engel

Downloads
- Plain Diff

Merge branch 'develop'

parents 225179b6 bdbf77f3

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

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

i18n/en.i18n.json
i18n/pt.i18n.json 2 additions, 1 deletion

i18n/pt.i18n.json
packages/rocketchat-slashcommands-invite/server.coffee 20 additions, 4 deletions

packages/rocketchat-slashcommands-invite/server.coffee
packages/rocketchat-ui-flextab/flex-tab/tabs/uploadedFilesList.coffee 3 additions, 0 deletions

...ketchat-ui-flextab/flex-tab/tabs/uploadedFilesList.coffee
packages/rocketchat-ui-flextab/flex-tab/tabs/uploadedFilesList.html 1 addition, 1 deletion

...ocketchat-ui-flextab/flex-tab/tabs/uploadedFilesList.html
server/methods/addUserToRoom.coffee 3 additions, 0 deletions

server/methods/addUserToRoom.coffee

with 30 additions and 6 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