Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source

Conflicts: MediaBrowser.WebDashboard/dashboard-ui/scripts/Itemdetailpage.js

...

This commit is contained in:

Techywarrior

2013-03-26 14:36:35 -07:00

parent e33fba75d5 fd226c8248

commit 7348edef90

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

Diff Content Not Available