pavelbannov 978cf0e34e Merge branch 'master' into feature/files-refactoring ... # Conflicts: # products/ASC.Files/Server/Controllers/FilesController.cs # products/ASC.Files/Server/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Server/Services/WCFService/FileOperations/FileOperation.cs		2020-03-19 16:07:16 +03:00
..
Client	Update yarn.lock files	2020-03-16 10:37:55 +03:00
Server	Merge branch 'master' into feature/files-refactoring	2020-03-19 16:07:16 +03:00