| Age | Commit message (Collapse) | Author |
|
Update to dotnet 5.0.3
(cherry picked from commit 426b55052f726fe33ffe1771bd317395c57a437d)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
|
|
Update to dotnet 5.0.2
(cherry picked from commit 3bf7e18886840307d56a304f1a2d28c95ce678d8)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
|
|
Update to dotnet 5.0.1
(cherry picked from commit a56ac654498298f2d67a5109f8112ba17ca9ee22)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Jellyfin.Data.csproj
|
|
|
|
|
|
# Conflicts:
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Jellyfin.Data.csproj
# MediaBrowser.Api/UserService.cs
# MediaBrowser.Controller/Library/IUserManager.cs
|
|
|
|
# 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
|
|
|
|
|
|
|