gopienkonikita 639a68edfd Merge branch 'feature/virtual-rooms-1.2' into feature/hotkeys ... # Conflicts: # products/ASC.Files/Client/src/pages/Home/Section/Header/index.js		2022-03-09 13:26:11 +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 'feature/virtual-rooms-1.2' into feature/hotkeys	2022-03-09 13:26:11 +03:00
ASC.Mail	Merge branch 'master' into develop	2022-02-21 22:22:38 +03:00
ASC.People	Web:People:Catalog: add translate 'OtherOperations' for main button mobile	2022-03-05 19:44:33 +03:00
ASC.Projects	Merge branch 'master' into develop	2022-02-21 22:22:38 +03:00