Klauswk 0ce41afabb Merge branch 'bbb-2x-mconf' into html5-toggle-mute		2017-08-08 13:59:00 -03:00
..
annotations	Merge clear annotations and annotationsWhiteboard	2017-08-02 17:14:01 -03:00
audio/client	removed unused constructor	2017-07-31 13:54:18 -07:00
bbb	Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x	2017-08-02 11:29:33 -03:00
breakouts	Merge clear annotations and annotationsWhiteboard	2017-08-02 17:14:01 -03:00
captions	Captions mapped	2017-07-27 17:18:44 -03:00
chat	Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design	2017-08-08 11:52:26 -03:00
cursor	Moved the meetingId to be last param	2017-06-29 10:09:11 -03:00
meetings	Move from annotation/ to annotations/	2017-08-02 16:52:13 -03:00
polls	Mapped polls	2017-07-26 14:08:00 -03:00
presentations	Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x	2017-08-02 11:29:33 -03:00
screenshare	removed unused constructor	2017-07-31 13:54:18 -07:00
slides	Merge clear annotations and annotationsWhiteboard	2017-08-02 17:14:01 -03:00
users	Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design	2017-08-03 09:53:44 -03:00
voice-users	Remove duplicate lines	2017-08-04 17:20:24 -03:00