Oleksandr Zhurbenko 65da71c12a Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x		2017-09-05 18:53:51 -07:00
..
1.1	Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x	2017-09-05 18:53:51 -07:00
2.0	Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x	2017-09-05 18:53:51 -07:00
acl	Fix inconsistency inside the ACL, #4310	2017-08-28 16:48:46 -03:00
common/server	Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x	2017-09-05 18:53:51 -07:00
log-client/server	Lint to eslint	2017-06-05 16:12:06 -03:00