You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@guacamole.apache.org by vn...@apache.org on 2019/07/16 22:39:32 UTC

[guacamole-client] 01/01: Merge 1.1.0 changes back to master.

This is an automated email from the ASF dual-hosted git repository.

vnick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git

commit ba12003fd2910f073e8e80e9e3443c8dfc4c8961
Merge: 63fa850 66d2fe3
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Tue Jul 16 18:39:03 2019 -0400

    Merge 1.1.0 changes back to master.

 .../src/main/resources/org/apache/guacamole/protocols/ssh.json        | 4 ++++
 .../src/main/resources/org/apache/guacamole/protocols/telnet.json     | 4 ++++
 guacamole/src/main/webapp/translations/en.json                        | 2 ++
 3 files changed, 10 insertions(+)