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

Browse Source

...

This commit is contained in:

Luke Pulverenti

2016-03-17 12:31:47 -04:00

parent 44929963d4 3e316c6d15

commit 807ec8b14e

1 changed files with 936 additions and 84 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

1020

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

File diff suppressed because it is too large Load Diff