jellyflood/Shared
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
..
Errors [create-pull-request] automated change 2021-08-13 23:57:00 +00:00
Extensions Merge branch 'main' into PangMo5/coordinator-and-deep-link 2021-09-20 17:46:29 +09:00
Objects Reduce item view complexity 2021-08-31 23:12:09 -06:00
Resources Create advanced settings view 2021-08-20 15:34:34 -06:00
ServerLocator start new logging agent 2021-07-12 21:14:14 -04:00
Singleton fix suggested changes 2021-08-26 02:22:28 +09:00
ViewModels Merge branch 'main' into PangMo5/coordinator-and-deep-link 2021-09-20 17:46:29 +09:00
Views Reduce item view complexity 2021-08-31 23:12:09 -06:00