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
..
config	Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x	2017-09-05 18:53:51 -07:00
locales	Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users	2017-09-01 11:22:45 -07:00