Joao Siebel 6e4e0a510a Merge branch 'remove-user-on-exit' into connection-manager		2020-09-08 16:36:01 -03:00
..
api	Merge branch 'remove-user-on-exit' into connection-manager	2020-09-08 16:36:01 -03:00
startup	Merge branch 'remove-user-on-exit' into connection-manager	2020-09-08 16:36:01 -03:00
ui	Merge branch 'remove-user-on-exit' into connection-manager	2020-09-08 16:36:01 -03:00
utils	Merge remote-tracking branch 'pedrobmarin/bbb-multiple-webcams' into upstream-2.2-vpeg-base	2020-08-05 14:20:58 +00:00