Merge branch 'beta' into dev

Browse Source

Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/paperdialoghelper/paperdialoghelper.js

...

This commit is contained in:

Luke Pulverenti

2016-02-05 23:51:15 -05:00

parent b63aaeb909 0f9f28308c

commit 0f5020097c

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