Ramón Souza f6e65f58c5 merge 2.4 into develop and resolve conflicts - partial		2022-01-12 16:40:45 +00:00
..
custom-players	feature(peertube): Add volume api into peertube custom player	2021-09-29 17:01:37 +00:00
modal	convert external-video-player modal component	2021-11-03 17:01:50 +00:00
volume-slider	merge 2.4 into develop and resolve conflicts - partial	2022-01-12 16:40:45 +00:00
component.jsx	merge 2.4 into develop and resolve conflicts - partial	2022-01-12 16:40:45 +00:00
container.jsx	resolve html5 conflicts	2021-12-10 21:07:35 +00:00
service.js	refactor(external videos): state as integer	2021-06-02 15:07:03 -03:00
styles.js	resolve html5 conflicts	2021-12-10 21:07:35 +00:00