Merge pull request #1233 from MediaBrowser/master

Browse Source

fix bad merge

...

This commit is contained in:

Luke

2015-10-28 13:12:25 -04:00

parent f2f4649569 087c7c332a

commit 6d016e0db9

2 changed files with 3765 additions and 7382 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

dashboard-ui/thirdparty/jquery.unveil-custom.js

Vendored

+198 -3821

File diff suppressed because it is too large Load Diff

dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js

Vendored

+3567 -3561

File diff suppressed because it is too large Load Diff