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

Browse Source

...

This commit is contained in:

Luke Pulverenti 2016-02-14 17:41:06 -05:00

parent b6763e81ca

commit 0abb78867a

1 changed files with 3524 additions and 338 deletions

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

3862

MediaBrowser.Server.Mac/Emby.Server.Mac.csproj

File diff suppressed because it is too large Load Diff