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
..
CookieSettingsModel.cs	Api: added cookiesettings	2022-02-18 18:28:03 +03:00
DnsSettingsModel.cs	Settings: added update dns settings method	2022-02-17 15:55:42 +03:00
LdapCronModel.cs	fix	2022-04-08 13:44:41 +03:00
LdapSettingsModel.cs	fix	2022-04-08 13:44:41 +03:00
PasswordSettingsModel.cs	Settings: update password settings	2022-02-17 18:25:07 +03:00