Merge remote-tracking branch 'upstream/v2.3.x-release' into issue-12665
Showing
- bigbluebutton-config/bigbluebutton-release 1 addition, 1 deletionbigbluebutton-config/bigbluebutton-release
- bigbluebutton-html5/imports/api/audio/client/bridge/sip.js 8 additions, 2 deletionsbigbluebutton-html5/imports/api/audio/client/bridge/sip.js
- bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx 4 additions, 2 deletions...ml5/imports/ui/components/audio/audio-modal/component.jsx
- bigbluebutton-html5/imports/ui/components/media/component.jsx 3 additions, 0 deletions...luebutton-html5/imports/ui/components/media/component.jsx
- bigbluebutton-html5/imports/ui/components/media/container.jsx 1 addition, 0 deletions...luebutton-html5/imports/ui/components/media/container.jsx
- bigbluebutton-html5/imports/ui/components/media/webcam-draggable-overlay/component.jsx 6 additions, 4 deletions...i/components/media/webcam-draggable-overlay/component.jsx
- bigbluebutton-html5/imports/ui/components/note/service.js 1 addition, 1 deletionbigbluebutton-html5/imports/ui/components/note/service.js
- bigbluebutton-html5/imports/ui/components/user-list/service.js 6 additions, 3 deletions...uebutton-html5/imports/ui/components/user-list/service.js
- bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx 7 additions, 5 deletions...list-content/user-participants/user-options/component.jsx
- bigbluebutton-html5/imports/ui/components/video-provider/service.js 7 additions, 2 deletions...ton-html5/imports/ui/components/video-provider/service.js
- bigbluebutton-html5/imports/ui/services/audio-manager/index.js 6 additions, 2 deletions...uebutton-html5/imports/ui/services/audio-manager/index.js
- bigbluebutton-html5/imports/ui/services/auth/index.js 5 additions, 1 deletionbigbluebutton-html5/imports/ui/services/auth/index.js
- bigbluebutton-web/grails-app/conf/bigbluebutton.properties 2 additions, 2 deletionsbigbluebutton-web/grails-app/conf/bigbluebutton.properties
Loading
Please register or sign in to comment