This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch next in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 640362765451cff4cfdc2c1d2ca7462fed571557 Merge: ed8677414 d3b784dfa Author: Michael Jumper <[email protected]> AuthorDate: Tue Aug 27 23:47:47 2024 -0700 Merge changes from main branch back to next. guacamole-common-js/src/main/webapp/modules/Keyboard.js | 4 +++- .../main/resources/org/apache/guacamole/protocols/rdp.json | 12 ++++++++++++ .../main/resources/org/apache/guacamole/protocols/ssh.json | 8 ++++++++ .../resources/org/apache/guacamole/protocols/telnet.json | 4 ++++ .../main/resources/org/apache/guacamole/protocols/vnc.json | 8 ++++++++ .../src/app/settings/templates/settingsConnections.html | 8 ++++---- guacamole/src/main/frontend/src/translations/en.json | 12 ++++++++++-- 7 files changed, 49 insertions(+), 7 deletions(-)
