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
..
LdapChange.cs	refactoring	2022-03-17 22:44:34 +03:00
LdapChangeCollection.cs	refactoring	2022-03-17 22:44:34 +03:00
LdapChangeEnums.cs	refactoring	2022-03-17 22:44:34 +03:00
LdapItemChange.cs	refactoring	2022-03-17 22:44:34 +03:00
LdapTaskProperty.cs	Merge branch 'develop' into feature/LDAP-new	2022-04-28 09:41:09 +03:00