jellyfin-server/MediaBrowser.Api/UserLibrary
Luke Pulverenti 8a2e023e28 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
..
ArtistsService.cs fix live tv chromecast playback 2015-08-14 23:15:25 -04:00
BaseItemsByNameService.cs fix live tv chromecast playback 2015-08-14 23:15:25 -04:00
BaseItemsRequest.cs Merge branch 'dev' 2016-01-11 21:55:52 -05:00
GameGenresService.cs fix live tv chromecast playback 2015-08-14 23:15:25 -04:00
GenresService.cs add tv suggestions 2015-08-20 22:36:30 -04:00
ItemsService.cs Merge branch 'dev' 2016-01-11 21:55:52 -05:00
MusicGenresService.cs fix live tv chromecast playback 2015-08-14 23:15:25 -04:00
PersonsService.cs fix live tv chromecast playback 2015-08-14 23:15:25 -04:00
PlaystateService.cs update startup wizard 2015-07-30 10:34:46 -04:00
StudiosService.cs fix live tv chromecast playback 2015-08-14 23:15:25 -04:00
UserLibraryService.cs consolidate slideout panels 2015-05-29 19:51:33 -04:00
UserViewsService.cs update views 2015-11-18 00:49:20 -05:00
YearsService.cs fix live tv chromecast playback 2015-08-14 23:15:25 -04:00