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

Browse Source

Conflicts:
	MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs

...

This commit is contained in:

Luke Pulverenti 2015-10-29 09:28:22 -04:00

parent 0bd1f36ece c155d18279

commit cf11c25f59

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available