Merge 1.1.0 changes back to master.

2025-09-06 13:17:41 +00:00 · 2019-05-10 10:09:23 -04:00
parent 1623f55191 4f550018a5
commit d61203c5ed
2 changed files with 5 additions and 0 deletions
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
@@ -90,6 +90,10 @@
                    "name"  : "command",
                    "type"  : "TEXT"
                },
+                {
+                    "name"  : "locale",
+                    "type"  : "TEXT"
+                },
                {
                    "name"  : "server-alive-interval",
                    "type"  : "NUMERIC"