Artem Tarasov 3b75038803 Merge branch 'develop' into feature/redesign-badges ... # Conflicts: # products/ASC.Files/Client/src/components/Badges.js # products/ASC.Files/Client/src/components/Icons.js # products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js # public/images/access.edit.react.svg		2021-12-29 15:45:33 +03:00
..
ASC.Calendar	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
ASC.CRM	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
ASC.Files	Merge branch 'develop' into feature/redesign-badges	2021-12-29 15:45:33 +03:00
ASC.Mail	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
ASC.People	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
ASC.Projects	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00