oledfish 3b075a5802 Merge branch 'jellyfin:master' into additional-episode-orders		2022-01-16 21:33:18 -03:00
..
Books	Pull default MergeData implementation to parent	2021-12-28 15:12:09 +01:00
BoxSets	Pull default MergeData implementation to parent	2021-12-28 15:12:09 +01:00
Channels	Pull default MergeData implementation to parent	2021-12-28 15:12:09 +01:00
Chapters	Address comments	2020-04-01 19:05:41 +02:00
Folders	Pull default MergeData implementation to parent	2021-12-28 15:12:09 +01:00
Genres	Pull default MergeData implementation to parent	2021-12-28 15:12:09 +01:00
LiveTv	Pull default MergeData implementation to parent	2021-12-28 15:12:09 +01:00
Manager	Merge pull request #7078 from 1337joe/metadata-merge-data	2022-01-16 23:17:40 +01:00
MediaInfo	Merge branch 'master' into comparisons	2021-12-24 02:41:50 +00:00
Movies	Pull default MergeData implementation to parent	2021-12-28 15:12:09 +01:00
Music	Pull default MergeData implementation to parent	2021-12-28 15:12:09 +01:00
MusicGenres	Pull default MergeData implementation to parent	2021-12-28 15:12:09 +01:00
People	Pull default MergeData implementation to parent	2021-12-28 15:12:09 +01:00
Photos	Pull default MergeData implementation to parent	2021-12-28 15:12:09 +01:00
Playlists	Pull default MergeData implementation to parent	2021-12-28 15:12:09 +01:00
Plugins	Merge branch 'jellyfin:master' into additional-episode-orders	2022-01-16 21:33:18 -03:00
Properties	Move non-jellyfin extensions to separate project	2021-06-19 18:04:46 +02:00
Studios	Pull default MergeData implementation to parent	2021-12-28 15:12:09 +01:00
Subtitles	Use our own Contains extension	2021-12-20 13:31:07 +01:00
TV	Merge pull request #7078 from 1337joe/metadata-merge-data	2022-01-16 23:17:40 +01:00
Videos	Pull default MergeData implementation to parent	2021-12-28 15:12:09 +01:00
Years	Pull default MergeData implementation to parent	2021-12-28 15:12:09 +01:00
MediaBrowser.Providers.csproj	Update StyleCop	2021-12-24 18:28:27 +01:00