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
..
constants.js	Merge branch 'develop' into feature/privacy-rooms-page	2021-06-30 16:28:37 +03:00
desktop.js	web: files: private room: fix upload dialog	2021-06-04 11:23:00 +03:00
files-converter.js	Web: Files: Applied prettier style fix	2020-10-16 16:27:22 +03:00
files-helpers.js	Web: Files: refactoring private rooms page	2021-06-28 14:36:38 +03:00
utils.js	Web: Files: fix after merge	2021-02-25 18:41:06 +03:00