Fix merge stuff
Showing
- bigbluebutton-html5/imports/api/2.0/users/server/handlers/presenterAssigned.js 5 additions, 5 deletions...mports/api/2.0/users/server/handlers/presenterAssigned.js
- bigbluebutton-html5/imports/api/2.0/users/server/methods/assignPresenter.js 1 addition, 1 deletion...5/imports/api/2.0/users/server/methods/assignPresenter.js
- bigbluebutton-html5/imports/api/acl/Acl.js 2 additions, 3 deletionsbigbluebutton-html5/imports/api/acl/Acl.js
- bigbluebutton-html5/imports/startup/client/base.jsx 1 addition, 2 deletionsbigbluebutton-html5/imports/startup/client/base.jsx
- bigbluebutton-html5/imports/ui/components/audio/service.js 1 addition, 1 deletionbigbluebutton-html5/imports/ui/components/audio/service.js
- bigbluebutton-html5/imports/ui/components/user-list/component.jsx 0 additions, 2 deletions...utton-html5/imports/ui/components/user-list/component.jsx
- bigbluebutton-html5/server/main.js 0 additions, 11 deletionsbigbluebutton-html5/server/main.js
Loading
Please register or sign in to comment