Vladislav Makhov 5bc3704ca5 Merge branch 'develop' into feature/desktop-view ... # Conflicts: # products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json # products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json # products/ASC.Files/Client/src/store/files/selectors.js		2020-12-30 13:11:54 +03:00
..
ASC.Files	Merge branch 'develop' into feature/desktop-view	2020-12-30 13:11:54 +03:00
ASC.People	Update yarn.lock files	2020-12-29 14:03:05 +03:00