Tatiana Lopaeva 29abce027d Merge branch 'develop' into feature/notifications ... # Conflicts: # packages/client/src/pages/Accounts.jsx # packages/client/src/store/FilesActionsStore.js # packages/common/constants/index.js # products/ASC.People/Server/Api/UserController.cs		2023-03-06 15:37:45 +03:00
..
Settings	Merge branch 'develop' into feature/notifications	2023-03-06 15:37:45 +03:00
AuthenticationController.cs	fix	2022-12-21 12:38:47 +03:00
CapabilitiesController.cs	removed unused variables	2022-12-09 16:34:00 +03:00
ConnectionsController.cs	WebHooks: added resources, new methods and settings for disable webhook	2023-02-08 14:17:06 +03:00
FeedController.cs	Web.Api: fix for rooms	2022-09-09 13:43:37 +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
PaymentsController.cs	Payment: fix	2023-01-10 20:56:38 +03:00
PortalController.cs	fix 60163	2023-01-13 14:28:44 +03:00
SecurityController.cs	Settings: refactoring	2023-02-24 17:19:10 +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