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
..
AuditEvent.cs	add dbTenant in models and rename "tenant" to "tenantid"	2023-04-25 00:17:29 +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
EventMessage.cs
EventTypeConverter.cs
LoginEvent.cs	add dbTenant in models and rename "tenant" to "tenantid"	2023-04-25 00:17:29 +03:00
MessageAction.cs	Merge branch 'develop' into feature/public-room-backend	2023-06-02 16:42:16 +03:00
MessageEvent.cs
MessagesContext.cs	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
MessageTarget.cs	removed unused variables	2022-12-09 16:34:00 +03:00