Vladislav Makhov 967a01061a Merge branch 'develop' into feature/files-recent ... # Conflicts: # products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/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 # products/ASC.Files/Client/src/store/files/selectors.js # web/ASC.Web.Common/src/api/files/index.js # web/ASC.Web.Components/src/components/icons/svg/index.js		2020-10-20 09:23:58 +03:00
..
files	Merge branch 'develop' into feature/files-recent	2020-10-20 09:23:58 +03:00
groups	Web: Common: Applied prettier style fix	2020-10-16 15:38:04 +03:00
modules	Web: Common: Applied prettier style fix	2020-10-16 15:38:04 +03:00
people	Web: Common: Applied prettier style fix	2020-10-16 15:38:04 +03:00
portal	Web: Common: Applied prettier style fix	2020-10-16 15:38:04 +03:00
settings	Web: Common: Applied prettier style fix	2020-10-16 15:38:04 +03:00
user	Web: Common: Applied prettier style fix	2020-10-16 15:38:04 +03:00
client.js	Web: Common: Applied prettier style fix	2020-10-16 15:38:04 +03:00
index.js	Web: Common: Applied prettier style fix	2020-10-16 15:38:04 +03:00