Commit Graph

9 Commits

Author SHA1 Message Date
411e3b7f58 Sso: fix 2022-05-13 11:52:49 +03:00
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
6ecc8e7071 code cleanup 2022-04-14 22:42:15 +03:00
202338d1f2 fix 2022-03-22 15:59:12 +03:00
65db98f65c added new license headers 2022-03-15 21:00:53 +03:00
78fafb08ab Microsoft.NET.Sdk.Worker 2022-03-05 18:38:42 +03:00
99378a027e Csproj: ImplicitUsings 2022-03-05 11:20:05 +03:00
3182235fc9 refactoring: update globalusings 2022-02-11 13:24:23 +03:00
01831ad0b6 refactoring: add globalusings: web.studio 2022-01-31 11:33:18 +03:00