Merge branch 'master' into patch-2

This commit is contained in:
Astrid
2019-10-18 13:37:09 +02:00
committed by GitHub
51 changed files with 2838 additions and 1518 deletions

View File

@@ -48,9 +48,9 @@ namespace PluralKit.API.Controllers
[HttpGet]
[RequiresSystem]
public async Task<ActionResult<PKSystem>> GetOwnSystem()
public Task<ActionResult<PKSystem>> GetOwnSystem()
{
return Ok(_auth.CurrentSystem);
return Task.FromResult<ActionResult<PKSystem>>(Ok(_auth.CurrentSystem));
}
[HttpGet("{hid}")]