Merge pull request #1992 from MediaBrowser/master

Browse Source

merge from master

...

This commit is contained in:

Luke

2016-07-27 15:32:30 -04:00

committed by GitHub

parent 897e056629 06b0cfb86f

commit 8e915ba5ba

1 changed files with 140 additions and 2444 deletions

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

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

2584

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

File diff suppressed because it is too large Load Diff