Vashchuk Nikita 442a6bb30a Merge branch 'develop' into feature/SSO-new ... # Conflicts: # config/nginx/onlyoffice.conf # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Studio/Startup.cs		2022-04-28 15:45:11 +03:00
..
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
.gitignore
appsettings.json
ASC.Web.Studio.csproj	Autofact.Extensions.DependencyInjection package moved to ASC.Api.Core	2022-03-21 17:39:01 +03:00
GlobalUsings.cs	Merge branch 'develop' into feature/SSO-new	2022-04-28 15:45:11 +03:00
Program.cs	Merge 'feature/backend-refactor' into feature/builder-extensions	2022-03-22 15:57:46 +03:00
Startup.cs	Merge branch 'develop' into feature/SSO-new	2022-04-28 15:45:11 +03:00