Oleksandr Zhurbenko 65da71c12a Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x		2017-09-05 18:53:51 -07:00
..
breakouts	Merge branch 'Acl' into Refactor2x	2017-06-19 11:28:17 -03:00
captions	Merge branch 'Acl' into Refactor2x	2017-06-19 11:28:17 -03:00
chat	removed unused functions	2017-08-28 09:14:18 -07:00
cursor	Fixed a cursor display/publish for both presenters and viewers	2017-07-28 17:29:40 -07:00
deskshare	rename deskshare to screenshare and adjust condition for viewing	2017-07-24 15:29:34 -04:00
meetings	Merge branch 'Acl' into Refactor2x	2017-06-19 11:28:17 -03:00
polls	Working poll vote	2017-06-30 11:26:19 -03:00
presentations	Merge branch 'Acl' into Refactor2x	2017-06-19 11:28:17 -03:00
shapes	Minor fixes and adjustments	2017-08-30 16:12:03 -07:00
slides	Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x	2017-08-16 19:24:59 -07:00
users	Merge remote-tracking branch 'upstream/master' into merge-master-mconf	2017-07-17 13:33:45 -03:00