perroned 1116cc0d1e Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 ... Conflicts: bigbluebutton-client/resources/config.xml.template		2017-02-02 15:27:08 +00:00
..
breakouts	Changes handlers for breakouts	2016-11-29 14:52:15 -02:00
captions	fix import for Logger	2016-12-07 16:12:46 +00:00
chat	Merge conflicts	2016-11-10 15:13:02 +00:00
common/server	Merge remote-tracking branch 'upstream/master' into refactor-poll-api	2016-10-24 13:39:37 -02:00
cursor	reduce logging of cursor	2016-12-07 20:50:51 +00:00
deskshare	Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2	2016-09-14 19:30:07 +00:00
meetings	fix handling of recording message	2017-01-09 18:58:33 +00:00
phone	linting fixes & updated based on feedback	2016-11-15 13:00:28 -08:00
polls	Polish breakout rooms code	2016-11-24 17:22:04 -02:00
presentations	HTML5 - Add the three emojis: applause, thumbs up, thumbs down and fixes some master lint issues	2016-12-20 10:06:01 -08:00
shapes	Refactor Shapes API	2016-11-18 17:59:11 +00:00
slides	HTML5 - Add the three emojis: applause, thumbs up, thumbs down and fixes some master lint issues	2016-12-20 10:06:01 -08:00
users	HTML5 - Add the three emojis: applause, thumbs up, thumbs down and fixes some master lint issues	2016-12-20 10:06:01 -08:00
verto	Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2	2016-09-14 19:30:07 +00:00