open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev

Browse Source 
Conflicts:
	MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
pull/702/head
Luke Pulverenti 9 years ago
parent 0bd1f36ece c155d18279
commit cf11c25f59
Show Stats Download Patch File Download Diff File

Diff Content Not Available