Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-11-20 05:23:00 -05:00
Code Issues Packages Projects Releases Wiki Activity
jellyfin/Jellyfin.Server.Implementations/Activity
History
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
..
ActivityManager.cs
Merge branch 'master' into authenticationdb-efcore
2021-08-13 21:08:24 -04:00