prlanzarin fab6d96769 video-provider: reimplement PR #9407 ... Some weird merged regressed #9407 when merging 2.2 in 2.3, and backporting the VP from 2.3 to 2.2 reintroduced the issue, so I reimplemented it		2020-08-05 14:35:08 +00:00
..
api	Merge remote-tracking branch 'pedrobmarin/bbb-multiple-webcams' into upstream-2.2-vpeg-base	2020-08-05 14:20:58 +00:00
startup	Pulled HTML5 locales on July 29, 2020	2020-07-29 11:54:21 -04:00
ui	video-provider: reimplement PR #9407	2020-08-05 14:35:08 +00:00
utils	Merge remote-tracking branch 'pedrobmarin/bbb-multiple-webcams' into upstream-2.2-vpeg-base	2020-08-05 14:20:58 +00:00