Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj		2020-06-13 19:41:05 -04:00
..
Entities	Actually fix profile images	2020-06-13 16:38:17 -04:00
Enums	Fix merge conflicts with SyncPlay	2020-05-26 20:52:05 -04:00
DayOfWeekHelper.cs	Clean up DayOfWeekHelper.cs and remove unnecessary function	2020-05-30 20:02:55 -04:00
IHasPermissions.cs	Expand and document IHasPermissions	2020-05-30 20:49:31 -04:00
ISavingChanges.cs	Apply review suggestions	2020-05-10 10:54:41 -04:00
Jellyfin.Data.csproj	Merge branch 'master' into userdb-efcore	2020-06-13 19:41:05 -04:00