pavelbannov 1e13f42c9c Merge branch 'feature/backend-refactor' into feature/remove-serviceprovider ... # Conflicts: # products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs # products/ASC.Files/Server/Api/FilesController.cs # products/ASC.Files/Server/Helpers/FilesControllerHelper.cs		2022-04-01 15:17:46 +03:00
..
Client	Web: Files: deleted useless folders after merge.	2022-03-22 13:22:51 +03:00
Core	Merge branch 'feature/backend-refactor' into feature/remove-serviceprovider	2022-04-01 15:17:46 +03:00
Server	Merge branch 'feature/backend-refactor' into feature/remove-serviceprovider	2022-04-01 15:17:46 +03:00
Service	Merge pull request #580 from ONLYOFFICE/feature/files-mapping	2022-03-29 16:59:43 +04:00
Tests	Merge pull request #580 from ONLYOFFICE/feature/files-mapping	2022-03-29 16:59:43 +04:00