• Kingtous's avatar
    Merge remote-tracking branch 'rustdesk/master' into flutter_desktop · 3b9c62b0
    Kingtous authored
    # Conflicts:
    #	.github/workflows/ci.yml
    #	Cargo.lock
    #	Cargo.toml
    #	flutter/lib/common.dart
    #	flutter/lib/mobile/pages/remote_page.dart
    #	flutter/lib/mobile/pages/server_page.dart
    #	flutter/lib/mobile/pages/settings_page.dart
    #	flutter/lib/mobile/widgets/dialog.dart
    #	flutter/lib/models/model.dart
    #	flutter/lib/models/server_model.dart
    #	src/client.rs
    #	src/common.rs
    #	src/ipc.rs
    #	src/mobile_ffi.rs
    #	src/rendezvous_mediator.rs
    #	src/ui.rs
    3b9c62b0