DocSpace-buildtools/web/ASC.Web.Api
pavelbannov 2b6c4b127a Merge branch 'develop' into feature/docspace-backup
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Server/Api/ThirdpartyController.cs
2022-08-17 13:58:00 +03:00
..
Api Merge branch 'develop' into feature/docspace-backup 2022-08-17 13:58:00 +03:00
ApiModels Files: removed .result 2022-08-12 16:26:57 +03:00
Core Settings: ignore id 2022-07-12 15:33:46 +03:00
Log Log: refactoring 2022-05-26 12:01:54 +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/LDAP-new 2022-07-01 13:15:52 +03:00
ASC.Web.Api.sln init commit 2019-05-15 17:56:09 +03:00
GlobalUsings.cs add "AddBaseDbContextPool" 2022-08-12 15:06:49 +03:00
Program.cs add "AddBaseDbContextPool" 2022-08-12 15:06:49 +03:00
Startup.cs Merge branch 'develop' into feature/LDAP-new 2022-04-28 09:41:09 +03:00