Vashchuk Nikita 4cab782bc8 Merge branch 'develop' into feature/LDAP-new ... # Conflicts: # ASC.Web.sln # common/ASC.Common/Security/Cryptography/InstanceCrypto.cs # common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs # web/ASC.Web.Api/ASC.Web.Api.csproj # web/ASC.Web.Api/Controllers/AuthenticationController.cs # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Api/Program.cs # web/ASC.Web.Api/Startup.cs		2022-04-28 09:41:09 +03:00
..
ASC.Web.Api	Merge branch 'develop' into feature/LDAP-new	2022-04-28 09:41:09 +03:00
ASC.Web.Campaigns	Merge branch 'develop' into hotfix/campaigns-banner	2022-03-14 15:51:38 +05:00
ASC.Web.Client	Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme	2022-04-21 18:55:41 +03:00
ASC.Web.Core	Merge branch 'develop' into feature/backend-refactor	2022-04-21 22:36:29 +03:00
ASC.Web.Editor	Web: Editor: Added icons url.	2022-04-15 17:59:39 +03:00
ASC.Web.HealthChecks.UI	refactoring	2022-04-15 12:08:06 +03:00
ASC.Web.Login	Web: Login: fix style	2022-04-20 12:58:20 +03:00
ASC.Web.Studio	code cleanup	2022-04-14 22:42:15 +03:00