Klaus e43a44e828 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options		2017-07-28 08:47:56 -03:00
..
1.1	Merge branch 'html5-2x-screenshare' of github.com:antobinary/bigbluebutton into html5-2x-fix-audio	2017-07-24 16:06:52 -04:00
2.0	Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options	2017-07-28 08:47:56 -03:00
acl	Fix presenter assign	2017-07-17 09:00:18 -03:00
common/server	Merged info with anton's branch	2017-07-03 12:05:35 -03:00
log-client/server	Lint to eslint	2017-06-05 16:12:06 -03:00