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

Browse Source

...

This commit is contained in:

Luke Pulverenti

2016-02-14 23:17:20 -05:00

parent 82f4518c55 182beacf4a

commit 622b0558d4

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

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