Tatiana Lopaeva bec4f11dcd Merge branch 'develop' into feature/stripe ... # Conflicts: # common/ASC.Api.Core/Extensions/HostBuilderExtension.cs # common/services/ASC.Notify/Program.cs # common/services/ASC.Studio.Notify/Program.cs # common/services/ASC.Webhooks.Service/Program.cs # packages/common/components/Loaders/index.js # packages/common/store/AuthStore.js # packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx # packages/login/webpack.config.js # products/ASC.Files/Service/Program.cs # web/ASC.Web.Api/Program.cs		2022-09-15 17:16:04 +03:00
..
Settings	Api: fixed colortheme	2022-07-21 20:51:01 +03:00
Skins	refactoring	2022-04-15 12:08:06 +03:00
CommonLinkUtility.cs	Web.Core: changed user profile url	2022-09-05 13:13:37 +03:00
IFileUploadHandler.cs	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00
PasswordSettings.cs	Settings: ignore id	2022-07-12 15:33:46 +03:00
SearchHandlerManager.cs	Added ASC.Web.Core	2019-06-07 11:59:07 +03:00
TenantExtra.cs	Merge branch 'develop' into feature/stripe	2022-09-15 17:16:04 +03:00
TenantLogoHelper.cs	refactoring	2022-04-15 12:08:06 +03:00
TenantStatisticsProvider.cs	refactoring	2022-04-15 12:08:06 +03:00
TransferResourceHelper.cs	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00
UrlShortener.cs	refactoring	2022-04-15 12:08:06 +03:00
UrlSwitcher.cs	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00