Vladislav Makhov b24bc1f05a Merge branch 'feature/files' into feature/files-favorites ... # Conflicts: # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js # products/ASC.Files/Client/src/components/pages/Home/index.js # products/ASC.Files/Client/src/store/files/selectors.js		2020-10-07 17:11:40 +03:00
..
Client	Merge branch 'feature/files' into feature/files-favorites	2020-10-07 17:11:40 +03:00
Core	Merge branch 'feature/files' into feature/payments-enterprise	2020-09-28 16:22:49 +03:00
Server	Files: fix count	2020-09-28 13:41:48 +03:00
Service	Merge branch 'master' into feature/files	2020-08-20 12:43:12 +03:00