Explorar o código

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

Conflicts:
	MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
Luke Pulverenti %!s(int64=9) %!d(string=hai) anos
pai
achega
cf11c25f59

Os datos das diferenzas Diff non están dispoñibles.