starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-17 22:43:07 +03:00
Code Issues Packages Projects Releases Wiki Activity
Files
ff9d14c8119f6cf77f21e4ebcc97c5580725b882
jellyfin-jellyfin-1/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
Patrick Barron 45f478f63e Merge branch 'master' into authenticationdb-efcore 
# Conflicts:
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
#	MediaBrowser.Controller/Security/IAuthenticationRepository.cs
#	MediaBrowser.Controller/Session/ISessionManager.cs
2021-08-13 21:08:24 -04:00

34 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink