Anton Georgiev b03f29497f Merge pull request #8926 from Tainan404/virtualized-userlist ... Virtualized user list		2020-08-12 14:12:48 -04:00
..
api	Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12	2020-08-12 17:12:58 +00:00
startup	Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12	2020-08-12 17:12:58 +00:00
ui	Merge pull request #8926 from Tainan404/virtualized-userlist	2020-08-12 14:12:48 -04:00
utils	Merge remote-tracking branch 'pedrobmarin/bbb-multiple-webcams' into upstream-2.2-vpeg-base	2020-08-05 14:20:58 +00:00