Oleksandr Zhurbenko 643d55938c Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x		2017-08-16 19:24:59 -07:00
..
1.1	Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x	2017-08-16 19:24:59 -07:00
2.0	Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x	2017-08-16 19:24:59 -07:00
acl	Fix merge stuff	2017-07-26 11:31:35 -03:00
common/server	Adjusted permissions for the multi-user cursorMove	2017-08-09 20:59:53 -07:00
log-client/server	Lint to eslint	2017-06-05 16:12:06 -03:00