jellyfin-web/dashboard-ui/bower_components/emby-webcomponents
Luke Pulverenti 7e639dbf67 Merge branch 'dev'
Conflicts:
	MediaBrowser.Controller/Entities/BaseItem.cs
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-apiclient/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-icons/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-icons/bower.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/html/kk.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/html/ru.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/kk.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/ru.json
	SharedVersion.cs
2016-01-11 21:55:52 -05:00
..
.bower.json update components 2016-01-10 12:36:51 -05:00
bower.json merge from dev 2015-12-27 01:18:22 -05:00
browser.js merge from dev 2015-12-27 01:18:22 -05:00
browserdeviceprofile.js Merge branch 'dev' 2016-01-11 21:55:52 -05:00
datetime.js update components 2015-12-30 17:14:34 -05:00
fetchhelper.js update components 2016-01-06 15:16:16 -05:00
LICENSE update components 2015-12-23 15:07:03 -05:00
qualityoptions.js update components 2016-01-06 15:16:16 -05:00
requirecss.js merge from dev 2015-12-27 01:18:22 -05:00
requirehtml.js merge from dev 2015-12-27 01:18:22 -05:00
visibleinviewport.js update components 2016-01-10 12:37:11 -05:00