Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

0fafec9b

Commit 0fafec9b authored 9 years ago by Diego Sampaio

Downloads
- Plain Diff

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

parents 6b398ced 1a7af0a3

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

packages/rocketchat-theme/assets/stylesheets/base.less 1 addition, 0 deletions

packages/rocketchat-theme/assets/stylesheets/base.less
packages/rocketchat-webrtc/WebRTCClass.coffee 19 additions, 13 deletions

packages/rocketchat-webrtc/WebRTCClass.coffee
packages/rocketchat-webrtc/i18n/en.i18n.json 3 additions, 5 deletions

packages/rocketchat-webrtc/i18n/en.i18n.json
packages/rocketchat-webrtc/server/settings.coffee 5 additions, 8 deletions

packages/rocketchat-webrtc/server/settings.coffee
server/startup/migrations/v30.coffee 37 additions, 0 deletions

server/startup/migrations/v30.coffee

with 65 additions and 26 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