Alexey Safronov 45d2a31d03 Merge branch 'feature/virtual-rooms-1.2' into feature/add-units ... # Conflicts: # public/locales/de/Common.json		2022-04-04 19:34:51 +03:00
..
images	Web:Files: fix third-party 24px folder-icons	2022-03-29 11:14:57 +03:00
locales	Merge branch 'feature/virtual-rooms-1.2' into feature/add-units	2022-04-04 19:34:51 +03:00
index.html	Web: init e2e tests	2021-12-21 15:59:11 +08:00