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

..

.bower.json

firefox hls fixes

2016-01-14 11:31:01 -05:00

bower.json

merge from dev

2015-12-14 10:43:03 -05:00

LICENSE.txt

switch polymer to bower

2015-06-19 12:36:51 -04:00

polymer-micro.html

merge from dev

2015-12-14 10:43:03 -05:00

polymer-mini.html

merge from dev

2015-12-14 10:43:03 -05:00

polymer.html

merge from dev

2015-12-14 10:43:03 -05:00