pavelbannov
570ede7bba
# 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 |
||
---|---|---|
.. | ||
ASC.Calendar | ||
ASC.CRM | ||
ASC.Files | ||
ASC.Mail | ||
ASC.People | ||
ASC.Projects |