pavelbannov 7f1d946269 Merge branch 'develop' into feature/stripe ... # Conflicts: # packages/client/src/Shell.jsx # packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js # packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js # packages/client/src/pages/PortalSettings/index.js # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.People/Server/Api/UserController.cs # products/ASC.People/Server/GlobalUsings.cs # web/ASC.Web.Core/HttpHandlers/SsoHandler.cs		2022-09-23 16:11:23 +03:00
..
AuditEvent.cs	Merge branch 'develop' into feature/migrations-fix	2022-07-11 13:28:49 +03:00
BaseEvent.cs	moved from ddf515b8	2022-06-07 21:00:08 +03:00
BaseEventTypeConverter.cs	moved from ddf515b8	2022-06-01 17:07:08 +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 branch 'develop' into feature/stripe	2022-09-23 16:11:23 +03:00
MessageEvent.cs	fix for merge	2022-07-11 12:29:45 +03:00
MessagesContext.cs	fixed tests and tools	2022-07-29 20:23:19 +03:00
MessageTarget.cs	fix for merge	2022-07-11 12:29:45 +03:00