Artem Tarasov f8e28e5952 Merge branch 'develop' into feature/thumbnails ... # Conflicts: # products/ASC.Files/Client/src/HOCs/withFileActions.js		2021-06-15 14:06:29 +03:00
..
Client	Merge branch 'develop' into feature/thumbnails	2021-06-15 14:06:29 +03:00
Core	Merge branch 'develop' into feature/restore-files-convertation	2021-06-11 15:17:35 +03:00
Server	Files: settings	2021-06-11 14:33:07 +03:00
Service	Tests moved to separate projects.	2021-06-01 12:21:51 +03:00
Tests	Files: fix tests	2021-04-07 18:08:15 +03:00