Files
jellyfin/MediaBrowser.Controller
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
..
2020-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2020-02-23 10:53:51 +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-05-12 22:10:35 -04:00
2019-01-13 21:37:13 +01:00
2020-05-13 00:00:57 -04: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-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2019-07-06 16:15:38 +02:00
2019-02-20 11:09:06 +01:00
2020-05-12 22:10:35 -04:00
2019-10-29 17:55:16 +01:00
2019-01-17 20:24:39 +01:00