Files
jellyfin/Emby.Dlna
Patrick Barron ae878fa051 Merge branch 'master' into authenticationdb-efcore
# Conflicts:
#	Emby.Server.Implementations/QuickConnect/QuickConnectManager.cs
#	Emby.Server.Implementations/Session/SessionManager.cs
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
2021-06-23 20:22:12 -04:00
..
2020-11-18 13:23:45 +00:00
2021-04-01 19:16:00 +02:00
2020-09-21 17:01:50 -04:00
2020-12-01 15:12:55 +01:00
2020-02-23 12:11:43 +01:00