Merge pull request #11848 from antobinary/apr1-merge
Merged 2.2.36 into 2.3-beta
Showing
- bigbluebutton-html5/imports/api/audio/client/bridge/sip.js 7 additions, 7 deletionsbigbluebutton-html5/imports/api/audio/client/bridge/sip.js
- bigbluebutton-html5/imports/api/captions/server/helpers.js 1 addition, 1 deletionbigbluebutton-html5/imports/api/captions/server/helpers.js
- bigbluebutton-html5/imports/api/captions/server/methods/appendText.js 2 additions, 6 deletions...n-html5/imports/api/captions/server/methods/appendText.js
- bigbluebutton-html5/imports/api/captions/server/methods/createCaptions.js 2 additions, 2 deletions...ml5/imports/api/captions/server/methods/createCaptions.js
- bigbluebutton-html5/imports/api/captions/server/methods/fetchReadOnlyPadId.js 3 additions, 7 deletions...imports/api/captions/server/methods/fetchReadOnlyPadId.js
- bigbluebutton-html5/imports/api/common/server/etherpad.js 52 additions, 0 deletionsbigbluebutton-html5/imports/api/common/server/etherpad.js
- bigbluebutton-html5/imports/api/common/server/helpers.js 0 additions, 3 deletionsbigbluebutton-html5/imports/api/common/server/helpers.js
- bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js 2 additions, 4 deletions...html5/imports/api/meetings/server/modifiers/addMeeting.js
- bigbluebutton-html5/imports/api/note/server/helpers.js 5 additions, 18 deletionsbigbluebutton-html5/imports/api/note/server/helpers.js
- bigbluebutton-html5/imports/api/note/server/methods/createNote.js 6 additions, 4 deletions...utton-html5/imports/api/note/server/methods/createNote.js
- bigbluebutton-html5/imports/ui/components/captions/service.js 4 additions, 1 deletion...luebutton-html5/imports/ui/components/captions/service.js
Loading
Please register or sign in to comment