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

Browse Source

Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/edititemmetadata.html

...

This commit is contained in:

Luke Pulverenti 2013-06-27 14:41:40 -04:00

parent 3070fa639f 30eafa61a5

commit 2653b7db49

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

Diff Content Not Available