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
..
HashAlg.cs	added new license headers	2022-03-15 21:00:53 +03:00
Hasher.cs	IDE1006	2022-03-25 19:26:06 +03:00
InstanceCrypto.cs	Merge branch 'develop' into feature/LDAP-new	2022-04-28 09:41:09 +03:00
MachinePseudoKeys.cs	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00
PasswordHasher.cs	added new license headers	2022-03-15 21:00:53 +03:00