Patrick Barron 01ce56016a Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj # MediaBrowser.Api/UserService.cs # MediaBrowser.Controller/Library/IUserManager.cs		2020-05-26 20:29:11 -04:00
..
AccessSchedule.cs	Initial migration code	2020-05-12 22:10:35 -04:00
BaseApplicationConfiguration.cs	Add tracking of JF version used to run this config previously	2020-03-05 16:22:15 +03:00
EncodingOptions.cs	Merge pull request #1 from jellyfin/master	2020-03-19 22:02:08 -04:00
ImageOption.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
ImageSavingConvention.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
LibraryOptions.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
MetadataConfiguration.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
MetadataOptions.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
MetadataPlugin.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
MetadataPluginSummary.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
MetadataPluginType.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
ServerConfiguration.cs	Address review comments	2020-05-14 17:13:45 -04:00
SyncplayAccess.cs	Rename Syncplay to SyncPlay	2020-05-09 12:37:39 +02:00
UserConfiguration.cs	Initial migration code	2020-05-12 22:10:35 -04:00
XbmcMetadataOptions.cs	Fix some warnings	2020-02-23 12:11:43 +01:00