Merge 1.1.0 changes back to master.

2025-10-31 17:13:21 +00:00 · 2019-05-10 11:04:19 -04:00
parent d61203c5ed 863147eb50
commit e02dcf8c84
3 changed files with 10 additions and 0 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
@@ -106,6 +106,10 @@
                        "tr-tr-qwerty"
                    ]
                },
+                {
+                    "name"  : "timezone",
+                    "type"  : "TEXT"
+                },
                {
                    "name"    : "console",
                    "type"    : "BOOLEAN",
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
@@ -94,6 +94,10 @@
                    "name"  : "locale",
                    "type"  : "TEXT"
                },
+                {
+                    "name"  : "timezone",
+                    "type"  : "TEXT"
+                },
                {
                    "name"  : "server-alive-interval",
                    "type"  : "NUMERIC"