diff options
| author | Patrick Barron <barronpm@gmail.com> | 2021-05-21 00:09:11 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2021-05-21 00:19:07 -0400 |
| commit | b6446c06eeddae46e4ee1d6ec65182a53cd74e51 (patch) | |
| tree | 3a18cb940e04cf2c2412fc52da63b5b4d0009f4c /Jellyfin.Server/CoreAppHost.cs | |
| parent | a0c6f7276211ac0429877fafa400368aba1430a9 (diff) | |
| parent | a937a854f2582a8770d9ada7c24375065a21f7a5 (diff) | |
Merge branch 'master' into authenticationdb-efcore
# Conflicts:
# Emby.Server.Implementations/Security/AuthenticationRepository.cs
# Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
# MediaBrowser.Controller/Devices/IDeviceManager.cs
Diffstat (limited to 'Jellyfin.Server/CoreAppHost.cs')
0 files changed, 0 insertions, 0 deletions