Vladislav Makhov 79989f7bf4 Merge branch 'develop' into feature/desktop-view ... # Conflicts: # products/ASC.Files/Client/src/components/Article/MainButton/index.js # products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json # products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json # web/ASC.Web.Common/src/store/auth/actions.js		2020-12-24 10:21:02 +03:00
..
ASC.Files	Merge branch 'develop' into feature/desktop-view	2020-12-24 10:21:02 +03:00
ASC.People	Merge branch 'master' into develop	2020-12-23 21:42:44 +03:00