Backup_Repos/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-06 16:28:10 +01:00
Code Issues Projects Releases Wiki Activity
jellyfin/Emby.Server.Implementations/Playlists
History
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
..
ManualPlaylistsFolder.cs Merge branch 'master' into userdb-efcore 2020-06-04 16:52:23 -04:00
PlaylistManager.cs Merge branch 'master' into userdb-efcore 2020-06-13 19:41:05 -04:00