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.Web.Api	Merge branch 'release/v1.2' into develop	2022-07-07 17:41:41 +03:00
ASC.Web.Campaigns	Web: Campaigns: added react device detect	2022-05-26 18:16:09 +05:00
ASC.Web.Client	Merge branch 'release/v1.2' into develop	2022-07-07 17:41:41 +03:00
ASC.Web.Core	Merge branch 'release/v1.2' into develop	2022-07-07 17:41:41 +03:00
ASC.Web.Editor	Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2	2022-07-04 18:04:06 +03:00
ASC.Web.HealthChecks.UI	refactoring	2022-04-15 12:08:06 +03:00
ASC.Web.Login	Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2	2022-07-04 18:04:06 +03:00
ASC.Web.Studio	removed referencies	2022-07-06 18:47:16 +03:00