Klaus d45ae64558 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x		2017-08-02 11:29:33 -03:00
..
breakouts
captions
chat
cursor
deskshare	rename deskshare to screenshare and adjust condition for viewing	2017-07-24 15:29:34 -04:00
meetings
polls
presentations
shapes
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