Merge branch 'dev' into feature/import-config-from-cloud

2023-11-01 21:42:07 +00:00 · 2023-11-01 21:42:07 +00:00 · 147726ecb0
commit 147726ecb0
parent 3e03002ead ae4ee6431d
33 changed files with 1299 additions and 365 deletions
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@ -61,6 +61,7 @@ public slots:
    bool isDefaultServerConfigContainsAmneziaDns();

    QJsonObject getDefaultServerConfig();
+    void updateContainersConfig();

 protected:
    QHash<int, QByteArray> roleNames() const override;