This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
from deb858a6d GUACAMOLE-374: Merge fix xmlstarlet syntax for RemoteIpValve
attributes
add ce06f1c55 GUACAMOLE-1642: Add translation string for encoding field.
add 61b43f420 GUACAMOLE-1642: Merge translation string for VNC encodings
field.
add 4dd7a84df GUACAMOLE-1196: Add option to disable display resize.
add f87fc3f99 GUACAMOLE-1196: Merge parameter definition and translation
for option to disable display resize.
add 77d4de10d Merge 1.6.0 changes back to patch.
add fff7ba412 Merge changes from patch branch back to main.
No new revisions were added by this update.
Summary of changes:
.../src/main/resources/org/apache/guacamole/protocols/vnc.json | 5 +++++
guacamole/src/main/frontend/src/translations/en.json | 8 +++++---
2 files changed, 10 insertions(+), 3 deletions(-)