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

Browse Source

...

This commit is contained in:

Luke Pulverenti 2015-08-27 15:59:56 -04:00

parent f4c25b2471 3425b53376

commit 64945eb171

1 changed files with 3057 additions and 387 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

3444

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

File diff suppressed because it is too large Load Diff