DocSpace-client/products
gopienkonikita 4659e25661 Merge branch 'develop' into feature/hotkeys
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/FilesPanels/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2022-02-28 10:46:26 +03:00
..
ASC.Calendar Merge branch 'master' into develop 2022-02-21 22:22:38 +03:00
ASC.CRM Merge branch 'develop' into feature/async 2022-02-23 16:01:55 +03:00
ASC.Files Merge branch 'develop' into feature/hotkeys 2022-02-28 10:46:26 +03:00
ASC.Mail Merge branch 'master' into develop 2022-02-21 22:22:38 +03:00
ASC.People Merge branch 'develop' into bugfix/fixed-dates-in-profile 2022-02-25 17:51:06 +03:00
ASC.Projects Merge branch 'master' into develop 2022-02-21 22:22:38 +03:00