2 Commits

Author	SHA1	Message	Date
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	8d7ae321a0	merge from dev	2015-12-27 01:18:22 -05:00