You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

cvium c658a883a2 Merge branch 'master' into keyframe_extraction_v1 ... # Conflicts: # Jellyfin.Api/Controllers/DynamicHlsController.cs # MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs # MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs		3 years ago
..
ClientLogDtos	…
ConfigurationDtos	…
EnvironmentDtos	…
LibraryDtos	…
LibraryStructureDto	…
LiveTvDtos	…
MediaInfoDtos	…
NotificationDtos	…
PlaybackDtos	…
PlaylistDtos	…
PluginDtos	…
SessionDtos	…
StartupDtos	…
StreamingDtos	Merge branch 'master' into keyframe_extraction_v1	3 years ago
SubtitleDtos	…
SyncPlayDtos	…
UserDtos	…
UserViewDtos	…
ConfigurationPageInfo.cs	…