Files
jellyfin-jellyfin-1/Emby.Server.Implementations/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
..
2019-11-27 16:29:56 +01:00
2020-02-23 12:11:43 +01:00
2020-05-12 22:10:35 -04:00
2020-02-23 12:11:43 +01:00
2020-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2020-04-21 10:18:26 +02:00
2020-04-20 10:18:12 +02:00
2020-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00