Vladislav Makhov 2757a785a0 Merge branch 'develop' into feature/files-favorites ... # Conflicts: # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js # web/ASC.Web.Common/src/api/files/index.js		2020-10-19 17:54:41 +03:00
..
ASC.Web.Api	DI: register fix	2020-10-18 19:34:30 +03:00
ASC.Web.Client	Update yarn.lock files	2020-10-16 16:38:11 +03:00
ASC.Web.Common	Merge branch 'develop' into feature/files-favorites	2020-10-19 17:54:41 +03:00
ASC.Web.Components	Merge branch 'develop' into feature/files-favorites	2020-10-19 17:54:41 +03:00
ASC.Web.Core	Merge branch 'master' into feature/files	2020-10-16 16:57:21 +03:00
ASC.Web.Studio	DI: register fix	2020-10-18 19:34:30 +03:00