gopienkonikita b088c925d6 Merge branch 'develop' into feature/personal ... # Conflicts: # products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js # products/ASC.Files/Client/src/pages/Home/index.js # products/ASC.Files/Client/src/store/FilesStore.js		2021-06-17 15:47:33 +03:00
..
ASC.Calendar	Merge branch 'develop' into feature/personal	2021-06-17 14:25:09 +03:00
ASC.CRM	Merge branch 'develop' into feature/personal	2021-06-17 14:25:09 +03:00
ASC.Files	Merge branch 'develop' into feature/personal	2021-06-17 15:47:33 +03:00
ASC.Mail	Merge branch 'develop' into feature/personal	2021-06-17 14:25:09 +03:00
ASC.People	Merge branch 'develop' into feature/personal	2021-06-17 14:25:09 +03:00
ASC.Projects	Merge branch 'develop' into feature/personal	2021-06-17 14:25:09 +03:00