merge 1.1.0 changes back to master.

2025-10-31 00:53:21 +00:00 · 2019-06-15 17:16:40 -04:00
parent 15bb363de3 ce106d6426
commit 1b48f21573
3 changed files with 0 additions and 9 deletions
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
@@ -215,10 +215,6 @@
                {
                    "name"  : "static-channels",
                    "type"  : "TEXT"
-                },
-                {
-                    "name"  : "timezone",
-                    "type"  : "TIMEZONE"
                }
            ]
        },
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
@@ -117,10 +117,6 @@
                    "name"    : "terminal-type",
                    "type"    : "ENUM",
                    "options" : [ "", "xterm", "xterm-256color", "vt220", "vt100", "ansi", "linux" ]
-                },
-                {
-                    "name"    : "timezone",
-                    "type"    : "TIMEZONE"
                }
            ]
        },