PangMo5
|
1863d973a9
|
Merge branch 'main' into PangMo5/coordinator-and-deep-link
# Conflicts:
# JellyfinPlayer.xcodeproj/project.pbxproj
# JellyfinPlayer/Components/PortraitItemView.swift
# JellyfinPlayer/ContinueWatchingView.swift
# JellyfinPlayer/EpisodeItemView.swift
# JellyfinPlayer/HomeView.swift
# JellyfinPlayer/ItemView.swift
# JellyfinPlayer/MovieItemView.swift
# JellyfinPlayer/SeasonItemView.swift
# JellyfinPlayer/SeriesItemView.swift
# JellyfinPlayer/SettingsView.swift
# Shared/ViewModels/ItemViewModel.swift
|
2021-09-20 17:46:29 +09:00 |