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.

Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj		4 years ago
..
Books	…
BoxSets	…
Channels	…
Chapters	…
Folders	…
Genres	…
LiveTv	…
Manager	Merge branch 'master' into userdb-efcore	4 years ago
MediaInfo	Merge pull request #3254 from crobibero/ilogger	4 years ago
Movies	…
Music	…
MusicGenres	…
People	…
Photos	…
Playlists	Merge pull request #3254 from crobibero/ilogger	4 years ago
Plugins	Merge pull request #3254 from crobibero/ilogger	4 years ago
Properties	…
Studios	…
Subtitles	…
TV	Merge pull request #3254 from crobibero/ilogger	4 years ago
Videos	…
Years	…
MediaBrowser.Providers.csproj	…