pavelbannov 5a5e299d98 Merge branch 'develop' into feature/webhooks ... # Conflicts: # ASC.Web.sln # common/ASC.Api.Core/Core/BaseStartup.cs # common/services/ASC.Data.Backup/ASC.Data.Backup.csproj # web/ASC.Web.Api/ASC.Web.Api.csproj		2021-10-19 18:30:59 +03:00
..
Controllers	Merge branch 'develop' into feature/webhooks	2021-10-19 18:30:59 +03:00
Core	WebStudio: resources	2021-05-27 21:30:15 +03:00
Models	Personal: fix quota	2021-10-14 13:47:12 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
appsettings.json	External config	2019-06-21 11:03:42 +03:00
ASC.Web.Api.csproj	Merge branch 'develop' into feature/webhooks	2021-10-19 18:30:59 +03:00
ASC.Web.Api.sln	init commit	2019-05-15 17:56:09 +03:00
Program.cs	Added asp logging	2021-08-08 16:19:54 +03:00
Startup.cs	Log: fix configuring	2021-07-13 21:17:18 +03:00