Home Explore Help
Sign In
mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

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

Conflicts:
	MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
Luke Pulverenti 9 years ago
parent
0bd1f36ece c155d18279
commit
cf11c25f59

Diff Data Not Available.