[desktop] Fix merge issues

This commit is contained in:
Vladimir Stoilov
2024-09-05 11:21:19 +03:00
parent 701505ae75
commit 8c6eb04292
7 changed files with 291 additions and 402 deletions

File diff suppressed because it is too large Load Diff