Sergey Linnik a1cb32ce36 Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions ... # Conflicts: # web/ASC.Web.Api/Api/Settings/WhitelabelController.cs		2023-04-05 20:07:30 +05:00
..
Settings	Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions	2023-04-05 20:07:30 +05:00
AuthenticationController.cs	Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions	2023-03-29 19:28:15 +05:00
CapabilitiesController.cs	fixes	2023-03-17 11:44:04 +03:00
ConnectionsController.cs	Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions	2023-03-29 19:28:15 +05:00
FeedController.cs	Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions	2023-04-05 20:07:30 +05:00
LdapController.cs	replace controllers	2022-03-01 13:03:25 +03:00
ModulesController.cs	Hude modules api documentation	2023-03-29 20:02:41 +05:00
PaymentsController.cs	Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions	2023-03-29 19:28:15 +05:00
PortalController.cs	Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions	2023-03-29 19:28:15 +05:00
SecurityController.cs	Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions	2023-03-29 19:28:15 +05:00
SmtpSettingsController.cs	Hide smtp api documentation	2023-03-29 20:02:54 +05:00
SsoSettingsV2Controller.cs	replace controllers	2022-03-01 13:03:25 +03:00
ThirdPartyController.cs	fixes	2023-03-17 11:44:04 +03:00