mirror of
https://github.com/4gray/iptvnator.git
synced 2026-10-14 13:16:16 -08:00
# Conflicts: # apps/web/src/app/app.config.ts # libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.spec.ts # libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.ts # libs/ui/playback/src/lib/player-controls/player-controls.component.settings-panel.spec.ts # libs/ui/playback/src/lib/player-controls/player-settings-panel.component.ts