Alexey Safronov fb5d1494d0 Merge branch 'release/v1.2' into feature/scroll-to-current-folder ... # Conflicts: # products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js		2022-05-17 15:40:44 +03:00
..
Client	Merge branch 'release/v1.2' into feature/scroll-to-current-folder	2022-05-17 15:40:44 +03:00
Core	Resources: fixed projects	2022-05-12 18:32:39 +03:00
Server	revert 85dffc552f 0c9147b815	2022-05-13 09:56:16 +03:00
Service	Files: thumbnails extension changed to jpg	2022-05-09 21:15:27 +03:00
Tests	Test: disable socketio	2022-02-23 17:10:04 +03:00