pavelbannov 7af929fee8 Merge branch 'release/v1.2' into develop ... # Conflicts: # common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs # common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs # products/ASC.People/Server/Controllers/PeopleController.cs # products/ASC.People/Server/Models/MemberModel.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2022-07-07 17:41:41 +03:00
..
ASC.Common.Tests	Test: fix	2022-05-13 18:08:30 +03:00
ASC.Core.Common.Tests	Test: fix	2022-05-13 18:08:30 +03:00
ASC.Notify.Textile.Tests	Test: fix	2022-05-13 18:08:30 +03:00
ASC.Web.Api.Tests	fix tests	2022-06-30 12:07:30 +03:00
ASC.Webhooks.Tests	fix tests	2022-06-30 12:07:30 +03:00
Frontend.Translations.Tests	added hy-AM	2022-07-04 11:38:57 +03:00