Vashchuk Nikita 57726421f2 Merge branch 'develop' into feature/login-settings ... # Conflicts: # web/ASC.Web.Api/Api/Settings/SettingsController.cs # web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs		2022-09-06 12:17:10 +04:00
..
CustomColorThemesSettings.cs	Api: fixed colortheme	2022-07-21 20:51:01 +03:00
LoginSettings.cs	fix	2022-09-02 15:13:10 +04:00
TenantAccessSettings.cs	Settings: ignore id	2022-07-12 15:33:46 +03:00
WebItemSettings.cs	Settings: ignore id	2022-07-12 15:33:46 +03:00
WizardSettings.cs	Settings: ignore id	2022-07-12 15:33:46 +03:00