Artem Tarasov cdecfc3ed3 Merge branch 'develop' into feature/fix-hide/show-header ... # Conflicts: # products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js # products/ASC.Files/Client/src/store/files/selectors.js # web/ASC.Web.Client/src/App.js		2021-01-21 16:45:35 +03:00
..
Client	Merge branch 'develop' into feature/fix-hide/show-header	2021-01-21 16:45:35 +03:00
Core	Merge branch 'develop' into feature/thirdparty-integrations	2021-01-18 17:17:01 +03:00
Server	Files: fix insert	2021-01-21 10:42:23 +03:00
Service	Files: removed temp	2021-01-13 12:41:29 +03:00
Tests	Files: removed temp	2021-01-13 12:41:29 +03:00