PangMo5 646467b8e7 Merge branch 'main' into R.swift ... # Conflicts: # JellyfinPlayer.xcodeproj/project.pbxproj # JellyfinPlayer.xcworkspace/xcshareddata/swiftpm/Package.resolved # Translations/en.lproj/Localizable.strings		2021-11-08 00:51:54 +09:00
..
project.xcworkspace	switch to official cast sdk.	2021-06-20 15:05:55 -04:00
xcshareddata	switch to official cast sdk.	2021-06-20 15:05:55 -04:00
project.pbxproj	Merge branch 'main' into R.swift	2021-11-08 00:51:54 +09:00