starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-17 06:23:03 +03:00
Code Issues Packages Projects Releases Wiki Activity
Files
e6f3531f403d0c895101ab0ad72e047f1905fde1
jellyfin-jellyfin-1/Jellyfin.Server.Implementations/Activity/ActivityManager.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

3.4 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink