jellyfin-server/MediaBrowser.Api/Library
Patrick Barron aca7e221d8 Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Jellyfin.Server/Jellyfin.Server.csproj
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Controller/Devices/IDeviceManager.cs
2020-05-15 17:20:07 -04:00
..
LibraryService.cs Merge branch 'master' into userdb-efcore 2020-05-15 17:20:07 -04:00
LibraryStructureService.cs Use ? and ?? where applicable 2020-04-05 12:45:01 -04:00