Sergey Linnik d2e23e3ed4 Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions ... # Conflicts: # common/ASC.Core.Common/Tenants/TenantQuota.cs # products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs # products/ASC.Files/Server/Api/FoldersController.cs # products/ASC.Files/Server/Api/OperationController.cs # products/ASC.Files/Server/Api/SettingsController.cs # web/ASC.Web.Api/Api/AuthenticationController.cs # web/ASC.Web.Api/Api/CapabilitiesController.cs # web/ASC.Web.Api/Api/PortalController.cs # web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs # web/ASC.Web.Api/Api/SmtpSettingsController.cs # web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs		2023-08-01 11:39:57 +03:00
..
AuditEvent.cs	Merge branch 'develop' into feature/migrations-fix	2022-07-11 13:28:49 +03:00
BaseEvent.cs	fix	2022-10-11 13:14:50 +03:00
BaseEventTypeResolver.cs	fix audit report	2023-04-22 15:54:34 +03:00
EventAttribute.cs	moved from ddf515b8	2022-06-01 17:07:08 +03:00
EventMessage.cs	Merge branch 'develop' into feature/migrations-fix	2022-07-11 13:28:49 +03:00
EventTypeConverter.cs	Merge branch 'develop' into feature/migrations-fix	2022-07-14 11:56:07 +03:00
LoginEvent.cs	Merge branch 'develop' into feature/migrations-fix	2022-07-14 11:56:07 +03:00
MessageAction.cs	Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions	2023-08-01 11:39:57 +03:00
MessageEvent.cs	fix for merge	2022-07-11 12:29:45 +03:00
MessagesContext.cs	refactoring	2023-06-14 11:47:11 +03:00
MessageTarget.cs	removed unused variables	2022-12-09 16:34:00 +03:00