pavelbannov 545bacfaf0 Merge branch 'develop' into fix-conflicts-merge ... # Conflicts: # packages/client/src/pages/VersionHistory/Section/Body/index.js # products/ASC.Files/Core/Configuration/FilesSettings.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Security/FileSecurity.cs # products/ASC.Files/Core/Core/Security/FileShareOptions.cs # products/ASC.Files/Server/Api/FoldersController.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs		2023-07-21 16:51:49 +03:00
..
Settings	Merge branch 'develop' into fix-conflicts-merge	2023-07-21 16:51:49 +03:00
AuthenticationController.cs	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
CapabilitiesController.cs	Merge branch 'develop' into feature/optimization-ef	2023-05-30 14:13:02 +03:00
ConnectionsController.cs	Merge branch 'develop' into feature/delete-portal	2023-06-08 15:53:31 +03:00
FeedController.cs	Merge branch 'develop' into feature/optimization-ef	2023-04-10 23:19:56 +03:00
LdapController.cs
ModulesController.cs	Api: removed CustomHttpMethodAttribute	2022-05-23 18:48:23 +03:00
PaymentsController.cs	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
PortalController.cs	fix build	2023-07-19 14:34:00 +03:00
SecurityController.cs	fix await using	2023-06-01 14:27:27 +03:00
SmtpSettingsController.cs	fix build	2023-07-19 14:34:00 +03:00
SsoSettingsV2Controller.cs
ThirdPartyController.cs	moved from ddf515b8	2022-06-15 12:46:21 +03:00