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 |
|
Luke Pulverenti
|
a238978c6e
|
update components
|
2016-01-10 12:37:11 -05:00 |
|
Luke Pulverenti
|
f0f02e5e4a
|
update components
|
2016-01-10 12:36:51 -05:00 |
|
Luke Pulverenti
|
2d4d70ed14
|
update components
|
2016-01-08 00:44:45 -05:00 |
|
Luke Pulverenti
|
6da165c3c2
|
update components
|
2016-01-06 15:16:16 -05:00 |
|
Luke Pulverenti
|
89c9a7b669
|
update components
|
2016-01-06 11:38:19 -05:00 |
|
Luke Pulverenti
|
517965f4bd
|
update components
|
2015-12-30 17:14:34 -05:00 |
|
Luke Pulverenti
|
caed9d9fbf
|
update components
|
2015-12-30 17:11:43 -05:00 |
|
Luke Pulverenti
|
90d7da094c
|
update quality options
|
2015-12-30 12:02:11 -05:00 |
|
Luke Pulverenti
|
5ca18644c6
|
use shared components for quality options
|
2015-12-29 12:11:19 -05:00 |
|
Luke Pulverenti
|
8d7ae321a0
|
merge from dev
|
2015-12-27 01:18:22 -05:00 |
|
Luke Pulverenti
|
be200035e3
|
update components
|
2015-12-23 15:07:03 -05:00 |
|