Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

8ab96de7

Commit 8ab96de7 authored 7 years ago by Martin Schoeler

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into webrtc-to-js

parents 879f169f 2543348a

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-i18n/i18n/en.i18n.json 6 additions, 1 deletion

packages/rocketchat-i18n/i18n/en.i18n.json
packages/rocketchat-ui-admin/client/adminInfo.coffee 10 additions, 1 deletion

packages/rocketchat-ui-admin/client/adminInfo.coffee
packages/rocketchat-ui-admin/client/adminInfo.html 44 additions, 0 deletions

packages/rocketchat-ui-admin/client/adminInfo.html
packages/rocketchat-ui/client/lib/fileUpload.coffee 2 additions, 0 deletions

packages/rocketchat-ui/client/lib/fileUpload.coffee
server/stream/streamBroadcast.js 15 additions, 0 deletions

server/stream/streamBroadcast.js

with 77 additions and 2 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