Patrick Barron e5380c653b Merge branch 'master' into ef-cleanup ... # Conflicts: # Jellyfin.Data/Entities/Libraries/MediaFileStream.cs # Jellyfin.Data/Jellyfin.Data.csproj		2021-03-14 10:19:35 -04:00
..
Entities	Merge branch 'master' into ef-cleanup	2021-03-14 10:19:35 -04:00
Enums	Create BaseItemKind enum	2021-02-10 17:09:23 -07:00
Events	Make EventArgs documentation more consistent.	2020-08-15 18:54:00 -04:00
Interfaces	Move IHasPermissions.cs to correct namespace	2021-03-01 19:37:46 -05:00
Queries	Rewrite activity log backend to use a query class.	2020-10-04 20:29:28 -04:00
DayOfWeekHelper.cs	Fix GetDaysOfWeek behavior	2021-03-13 22:40:23 +01:00
Jellyfin.Data.csproj	Merge branch 'master' into ef-cleanup	2021-03-14 10:19:35 -04:00