Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

baaff9da

Commit baaff9da authored 9 years ago by Marcelo Schmidt

Downloads
- Plain Diff

Merge branch 'master' of github.com:RocketChat/Rocket.Chat

parents be847897 1f732e57

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

client/stylesheets/base.less 2 additions, 0 deletions

client/stylesheets/base.less
client/views/login/services.coffee 1 addition, 0 deletions

client/views/login/services.coffee
i18n/en.i18n.json 1 addition, 0 deletions

i18n/en.i18n.json
packages/rocketchat-custom-oauth/custom_oauth_client.coffee 12 additions, 4 deletions

packages/rocketchat-custom-oauth/custom_oauth_client.coffee
packages/rocketchat-custom-oauth/custom_oauth_server.coffee 12 additions, 5 deletions

packages/rocketchat-custom-oauth/custom_oauth_server.coffee
packages/rocketchat-lib/settings/server/addOAuthService.coffee 10 additions, 9 deletions

...ges/rocketchat-lib/settings/server/addOAuthService.coffee
packages/rocketchat-lib/settings/server/updateServices.coffee 5 additions, 1 deletion

...ages/rocketchat-lib/settings/server/updateServices.coffee

with 43 additions and 19 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