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 |
||
---|---|---|
.. | ||
Import | ||
CustomNamingPeople.cs | ||
UserHelpTourSettings.cs | ||
UserInfoComparer.cs | ||
UserInfoExtension.cs | ||
UserManagerWrapper.cs | ||
UserPhotoManager.cs | ||
UserPhotoThumbnailManager.cs | ||
UserPhotoThumbnailSettings.cs | ||
UserSortOrder.cs |