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
..
images	fix for eb896018d4 2b19ec7997	2022-06-23 15:43:22 +03:00
locales	Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2	2022-07-04 11:39:38 +03:00
index.html	Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner	2022-05-30 15:33:17 +03:00