gopienkonikita 69889cab4c Merge branch 'develop' into feature/privacy-rooms-page ... # Conflicts: # packages/asc-web-common/components/PageLayout/index.js # products/ASC.Files/Client/src/HOCs/withFileActions.js # products/ASC.Files/Client/src/helpers/constants.js # products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js # products/ASC.Files/Client/src/store/FilesStore.js		2021-06-30 16:28:37 +03:00
..
ASC.Calendar	RazorCompileOnBuild:false<	2021-06-16 20:08:26 +03:00
ASC.CRM	Merge branch 'develop' into feature/remove_itemList	2021-06-29 12:47:56 +03:00
ASC.Files	Merge branch 'develop' into feature/privacy-rooms-page	2021-06-30 16:28:37 +03:00
ASC.Mail	RazorCompileOnBuild:false<	2021-06-16 20:08:26 +03:00
ASC.People	Merge branch 'develop' into feature/privacy-rooms-page	2021-06-30 16:28:37 +03:00
ASC.Projects	RazorCompileOnBuild:false<	2021-06-16 20:08:26 +03:00