DocSpace-buildtools/products/ASC.Files/Server/Api
pavelbannov 2b6c4b127a Merge branch 'develop' into feature/docspace-backup
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Server/Api/ThirdpartyController.cs
2022-08-17 13:58:00 +03:00
..
ApiControllerBase.cs Async: refactoring 2022-08-03 17:29:20 +03:00
EditorController.cs Async: refactoring 2022-08-03 17:29:20 +03:00
FilesController.cs Files: fix 2022-08-11 19:02:52 +03:00
FoldersController.cs Files: fix 2022-08-11 19:02:52 +03:00
MasterFormController.cs Async: refactoring 2022-08-03 17:29:20 +03:00
OperationController.cs Files: async 2022-08-04 13:47:18 +03:00
PrivacyRoomController.cs Merge branch 'develop' into feature/12.0 2022-06-17 19:19:00 +03:00
SecutiryController.cs Files: async fix 2022-08-08 23:03:58 +03:00
SettingsController.cs Async: refactoring 2022-08-03 17:29:20 +03:00
TagsController.cs Async: refactoring 2022-08-03 17:29:20 +03:00
ThirdpartyController.cs Merge branch 'develop' into feature/docspace-backup 2022-08-17 13:58:00 +03:00
UploadController.cs Async: refactoring 2022-08-03 17:29:20 +03:00
VirtualRoomsController.cs Async: refactoring 2022-08-03 17:29:20 +03:00