Artem Tarasov fbab4041c9 Merge branch 'develop' into feature/thumbnails ... # Conflicts: # products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js # products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js # products/ASC.Files/Server/DocStore		2021-06-02 15:07:40 +03:00
..
Client	Merge branch 'develop' into feature/thumbnails	2021-06-02 15:07:40 +03:00
Core	Merge branch 'develop' into feature/11.5.2	2021-05-31 18:13:08 +03:00
Server	Merge branch 'develop' into feature/11.5.2	2021-05-31 13:32:51 +03:00
Service	Files: thumbnails. 2e37dcd0	2021-05-30 21:52:32 +03:00
Tests	Files: fix tests	2021-04-07 18:08:15 +03:00