Klaus 63fee3b615 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options		2017-08-02 11:36:16 -03:00
..
1.1	removed unused constructor	2017-07-31 13:54:18 -07:00
2.0	Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options	2017-08-02 11:36:16 -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