crobibero dbeeb7cf4a fix merge conflicts		2020-08-03 12:01:24 -06:00
..
Playback	Merge remote-tracking branch 'upstream/master' into api-migration	2020-08-03 11:24:13 -06:00
Properties	* Add support for multi segment base urls	2019-11-25 11:55:24 +01:00
ScheduledTasks	changes from merge	2020-07-20 14:43:54 -06:00
Sessions	changes from merge	2020-07-20 14:43:54 -06:00
System	changes from merge	2020-07-20 14:43:54 -06:00
ApiEntryPoint.cs	Add full stop at end of comments (SA1629)	2020-06-16 10:37:52 +12:00
BaseApiService.cs	Add full stop at end of comments (SA1629)	2020-06-16 10:37:52 +12:00
IHasDtoOptions.cs	fix SA1513/SA1516	2020-06-16 16:11:30 +12:00
IHasItemFields.cs	Add full stop at end of comments (SA1629)	2020-06-16 10:37:52 +12:00
MediaBrowser.Api.csproj	Move ImageService.cs to Jellyfin.Api	2020-07-21 13:17:08 -06:00
TestService.cs	fix tests	2020-06-22 08:14:07 -06:00
TranscodingJob.cs	fix SA1513/SA1516	2020-06-16 16:11:30 +12:00