jellyfin/Emby.Server.Implementations/SyncPlay
Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
2020-06-13 19:41:05 -04:00
..
SyncPlayController.cs Enable TreatWarningsAsErrors for Jellyfin.Server.Implementations in Release mode 2020-05-29 11:28:19 +02:00
SyncPlayManager.cs Merge branch 'master' into userdb-efcore 2020-06-13 19:41:05 -04:00