merge 1.1.0 changes back to master.

This commit is contained in:
Virtually Nick
2019-06-15 17:16:40 -04:00
3 changed files with 0 additions and 9 deletions

View File

@@ -215,10 +215,6 @@
{ {
"name" : "static-channels", "name" : "static-channels",
"type" : "TEXT" "type" : "TEXT"
},
{
"name" : "timezone",
"type" : "TIMEZONE"
} }
] ]
}, },

View File

@@ -117,10 +117,6 @@
"name" : "terminal-type", "name" : "terminal-type",
"type" : "ENUM", "type" : "ENUM",
"options" : [ "", "xterm", "xterm-256color", "vt220", "vt100", "ansi", "linux" ] "options" : [ "", "xterm", "xterm-256color", "vt220", "vt100", "ansi", "linux" ]
},
{
"name" : "timezone",
"type" : "TIMEZONE"
} }
] ]
}, },

View File

@@ -419,7 +419,6 @@
"FIELD_HEADER_REMOTE_APP_ARGS" : "Parameters:", "FIELD_HEADER_REMOTE_APP_ARGS" : "Parameters:",
"FIELD_HEADER_REMOTE_APP_DIR" : "Working directory:", "FIELD_HEADER_REMOTE_APP_DIR" : "Working directory:",
"FIELD_HEADER_REMOTE_APP" : "Program:", "FIELD_HEADER_REMOTE_APP" : "Program:",
"FIELD_HEADER_TIMEZONE" : "Timezone:",
"FIELD_HEADER_SECURITY" : "Security mode:", "FIELD_HEADER_SECURITY" : "Security mode:",
"FIELD_HEADER_SERVER_LAYOUT" : "Keyboard layout:", "FIELD_HEADER_SERVER_LAYOUT" : "Keyboard layout:",
"FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:",