Vashchuk Nikita c74da79ba2 Merge branch 'develop' into feature/async ... # Conflicts: # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs # products/ASC.Files/Core/Services/DocumentService/Configuration.cs # products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs # products/ASC.Files/Core/Utils/EntryManager.cs # products/ASC.Files/Core/Utils/FileUploader.cs # products/ASC.Files/Server/Controllers/FilesController.cs # products/ASC.Files/Server/Helpers/FilesControllerHelper.cs		2022-01-12 22:07:21 +03:00
..
Context	Merge branch 'develop' into feature/async	2021-12-17 10:48:44 +03:00
Model	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
IQueryableExtensions.cs	fix warnings	2020-10-12 16:52:31 +03:00
JsonExtensions.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
LinqExtensions.cs	core: added new ThenBy linq extension. crm: fixed sql	2021-06-30 19:08:41 +03:00
MigrationHistory.cs	replace type name with type	2021-10-22 13:08:09 +03:00