pavelbannov 570ede7bba Merge branch 'develop' into feature/11.5.2 ... # Conflicts: # common/ASC.Data.Storage/StorageUploader.cs # common/services/ASC.Data.Backup/Service/BackupWorker.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2021-05-31 13:32:51 +03:00
..
ASC.Calendar	Merge branch 'master' into develop	2021-05-29 21:57:42 +03:00
ASC.CRM	Merge branch 'master' into develop	2021-05-29 21:57:42 +03:00
ASC.Files	Merge branch 'develop' into feature/11.5.2	2021-05-31 13:32:51 +03:00
ASC.Mail	Merge branch 'master' into develop	2021-05-29 21:57:42 +03:00
ASC.People	Merge branch 'develop' into feature/11.5.2	2021-05-31 13:32:51 +03:00
ASC.Projects	Merge branch 'master' into develop	2021-05-29 21:57:42 +03:00