pavelbannov 7af929fee8 Merge branch 'release/v1.2' into develop ... # Conflicts: # common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs # common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs # products/ASC.People/Server/Controllers/PeopleController.cs # products/ASC.People/Server/Models/MemberModel.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2022-07-07 17:41:41 +03:00
..
Settings	Merge branch 'release/v1.2' into develop	2022-07-07 17:41:41 +03:00
AuthenticationController.cs	fix order	2022-06-29 19:43:29 +03:00
CapabilitiesController.cs	moved from ddf515b8	2022-06-07 21:00:08 +03:00
ConnectionsController.cs	moved from ddf515b8	2022-06-14 11:11:41 +03:00
LdapController.cs	replace controllers	2022-03-01 13:03:25 +03:00
ModulesController.cs	Api: removed CustomHttpMethodAttribute	2022-05-23 18:48:23 +03:00
PortalController.cs	moved from ddf515b8	2022-06-14 11:11:41 +03:00
SecurityController.cs	enum generator	2022-07-05 16:58:11 +03:00
SmtpSettingsController.cs	Api: removed CustomHttpMethodAttribute	2022-05-23 18:48:23 +03:00
SsoSettingsV2Controller.cs	replace controllers	2022-03-01 13:03:25 +03:00
ThirdPartyController.cs	moved from ddf515b8	2022-06-15 12:46:21 +03:00