Klaus d45ae64558 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x		2017-08-02 11:29:33 -03: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	Handling chat messages	2017-07-11 13:57:54 -03:00
cursor	Merge branch 'Acl' into Refactor2x	2017-06-19 11:28:17 -03: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	Merge branch 'Acl' into Refactor2x	2017-06-19 11:28:17 -03:00
slides	Slides reflecting akkaApps	2017-07-24 14:50:44 -03:00
users	Merge remote-tracking branch 'upstream/master' into merge-master-mconf	2017-07-17 13:33:45 -03:00