koen 213259fde5 Merge branch 'main' into subtitle-sizes ... # Conflicts: # Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift		2022-01-09 13:23:22 +01:00
..
PlaybackSpeed.swift	rename jellyfinplayer to swiftfin	2022-01-07 11:05:54 -07:00
PlayerOverlayDelegate.swift	rename jellyfinplayer to swiftfin	2022-01-07 11:05:54 -07:00
VLCPlayerOverlayView.swift	rename jellyfinplayer to swiftfin	2022-01-07 11:05:54 -07:00
VLCPlayerView.swift	rename jellyfinplayer to swiftfin	2022-01-07 11:05:54 -07:00
VLCPlayerViewController.swift	Merge branch 'main' into subtitle-sizes	2022-01-09 13:23:22 +01:00