Artem Tarasov bfd11ede79 Merge branch 'develop' into feature/version-hostory-redesign ... # Conflicts: # products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js # products/ASC.Files/Client/src/store/files/actions.js # web/ASC.Web.Common/src/components/PageLayout/index.js		2020-12-21 13:15:43 +03:00
..
ASC.Files	Merge branch 'develop' into feature/version-hostory-redesign	2020-12-21 13:15:43 +03:00
ASC.People	Merge branch 'master' into develop	2020-12-17 21:03:48 +03:00