Artem Tarasov e7a7aed6ec Merge branch 'develop' into feature/thumbnails ... # Conflicts: # packages/asc-web-common/components/PageLayout/index.js # products/ASC.Files/Client/src/Files.jsx # products/ASC.Files/Client/src/HOCs/withFileActions.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js # products/ASC.Files/Client/src/pages/Home/index.js # products/ASC.Files/Client/src/store/index.js		2021-05-28 15:30:39 +03:00
..
ASC.Calendar	Web: Moved custom.scss to @appserver/common	2021-05-19 11:14:44 +03:00
ASC.CRM	Web: Moved custom.scss to @appserver/common	2021-05-19 11:14:44 +03:00
ASC.Files	Merge branch 'develop' into feature/thumbnails	2021-05-28 15:30:39 +03:00
ASC.Mail	Web: Moved custom.scss to @appserver/common	2021-05-19 11:14:44 +03:00
ASC.People	Web: People: MyProfile: Fix translations loading	2021-05-20 11:45:13 +03:00
ASC.Projects	Web: Moved custom.scss to @appserver/common	2021-05-19 11:14:44 +03:00