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
2016-01-11 21:55:52 -05:00
2015-12-14 10:43:03 -05:00
S
Description
No description provided
GPL-2.0 208 MiB
Languages
JavaScript 44.6%
TypeScript 27.4%
SCSS 23.4%
HTML 4.5%