Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

fairblue
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents
- Service Desk

Snippets Groups Projects

5825b635

Commit 5825b635 authored 6 years ago by Maxim Khlobystov

Downloads
- Plain Diff

Merge branch 'v2.0.x-release' of...

Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into ice-connection-state-errors-2

parents 82a69fb9 6f4e00ae

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

bigbluebutton-config/bigbluebutton-release 1 addition, 1 deletion

bigbluebutton-config/bigbluebutton-release
bigbluebutton-config/bin/bbb-conf 14 additions, 13 deletions

bigbluebutton-config/bin/bbb-conf
bigbluebutton-config/cron.daily/bigbluebutton 1 addition, 1 deletion

bigbluebutton-config/cron.daily/bigbluebutton
bigbluebutton-html5/client/compatibility/kurento-extension.js 5 additions, 3 deletions

...luebutton-html5/client/compatibility/kurento-extension.js
bigbluebutton-html5/client/compatibility/kurento-utils.js 27 additions, 10 deletions

bigbluebutton-html5/client/compatibility/kurento-utils.js
bigbluebutton-html5/imports/api/audio/client/bridge/kurento.js 21 additions, 0 deletions

...uebutton-html5/imports/api/audio/client/bridge/kurento.js
bigbluebutton-html5/imports/ui/components/chat/service.js 3 additions, 4 deletions

bigbluebutton-html5/imports/ui/components/chat/service.js
bigbluebutton-html5/imports/ui/services/audio-manager/index.js 19 additions, 23 deletions

...uebutton-html5/imports/ui/services/audio-manager/index.js

with 91 additions and 55 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

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net