This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch staging/1.6.0 in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit c243af2ad1d36339d45f650b66a4524de8b2beb0 Merge: d5a27f093 2a97e327f Author: Mike Jumper <[email protected]> AuthorDate: Mon Aug 26 23:52:32 2024 -0700 GUACAMOLE-600: Merge settings and translations for timeout parameters. .../src/main/resources/org/apache/guacamole/protocols/rdp.json | 8 ++++++++ .../src/main/resources/org/apache/guacamole/protocols/ssh.json | 4 ++++ .../main/resources/org/apache/guacamole/protocols/telnet.json | 4 ++++ .../src/main/resources/org/apache/guacamole/protocols/vnc.json | 4 ++++ guacamole/src/main/frontend/src/translations/en.json | 9 +++++++-- 5 files changed, 27 insertions(+), 2 deletions(-)
