This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 74adacbe66b8e459fc5a1e44467dc7682d93bf86 Merge: fcc304a 2ec9567 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 29 12:45:38 2024 +0000 Merge branch 'personal/sunweaver/specified-key-wins-over-lookforkeys' into 'master' x2go/{backends/control/plain,sshproxy}.py: Don't let look_for_keys override... See merge request x2go/client/libs/python-x2go!5 x2go/backends/control/plain.py | 6 +++--- x2go/sshproxy.py | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git