Ghazi Triki 66a050b00b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0 ... # Conflicts: # bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml # bigbluebutton-config/bigbluebutton-release # bigbluebutton-html5/imports/api/users/server/handlers/guestApproved.js (Not Fixed)		2018-07-16 16:08:38 +01:00
..
handlers	disable HTML5 waiting screen for guest approve	2018-07-11 12:46:44 +00:00
methods	Merge pull request #5722 from antobinary/breakouts-improvements-3	2018-06-27 12:35:16 -04:00
modifiers	Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into current	2018-07-03 20:17:42 +00:00
eventHandlers.js	disable HTML5 waiting screen for guest approve	2018-07-11 12:46:44 +00:00
index.js	Moved files up to api/	2017-10-11 18:09:35 -07:00
methods.js	Impl user-session based connections on server. Fix #5150	2018-02-20 11:26:36 -03:00
publishers.js	Move userLeft out of subscription stop to socket close event. Closes #5240	2018-03-16 16:18:10 -03:00