Vladislav Makhov a179ae0e6c Merge branch 'feature/files' into feature/files-favorites ... # Conflicts: # products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js # web/ASC.Web.Common/src/api/files/index.js		2020-10-12 14:45:53 +03:00
..
ASC.Files	Merge branch 'feature/files' into feature/files-favorites	2020-10-12 14:45:53 +03:00
ASC.People	Web: People: Added hack for build machine only	2020-10-09 19:14:48 +03:00