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
..
Client	Merge branch 'feature/virtual-rooms-1.2' into feature/hotkeys	2022-03-09 13:26:11 +03:00
Core	Files: fix sql	2022-02-24 14:45:58 +03:00
Server	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-01 13:50:26 +03:00
Service	Merge branch 'develop' into feature/async	2022-02-23 16:01:55 +03:00
Tests	Test: disable socketio	2022-02-23 17:10:04 +03:00