crobibero 524243a934 fix merge conflict		2020-06-14 20:18:06 -06:00
..
Auth	Merge remote-tracking branch 'upstream/master' into HEAD	2020-06-14 20:15:26 -06:00
Constants	Fix more review comments	2019-11-24 19:25:46 +01:00
Controllers	fix merge conflict	2020-06-14 20:18:06 -06:00
Helpers	Add default values for parameters and fix spelling	2020-06-07 18:10:08 +02:00
Models	Fix merge and build	2020-06-13 13:11:41 -06:00
BaseJellyfinApiController.cs	Fix merge and build	2020-06-13 13:11:41 -06:00
Jellyfin.Api.csproj	merge master into api-migration	2020-06-13 13:03:09 -06:00
MvcRoutePrefix.cs	Add style rules and fix it all	2019-11-23 20:31:17 +01:00