Commit Graph

5 Commits

Author SHA1 Message Date
Luke Pulverenti
d33230d361 fix merge conflicts 2016-01-19 14:49:42 -05:00
Luke Pulverenti
d96250df7f firefox hls fixes
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
2016-01-14 11:31:01 -05:00
Luke Pulverenti
6da165c3c2 update components 2016-01-06 15:16:16 -05:00
Luke Pulverenti
90d7da094c update quality options 2015-12-30 12:02:11 -05:00
Luke Pulverenti
8d7ae321a0 merge from dev 2015-12-27 01:18:22 -05:00