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/05/10 14:10:11 UTC

[guacamole-client] branch master updated (1623f55 -> d61203c)

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

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


    from 1623f55  Merge 1.1.0 changes back to master.
     add b5c5fa3  GUACAMOLE-649: Add definition and translation for SSH "locale" parameter.
     add 4f55001  GUACAMOLE-649: Merge add definition and translation for SSH "locale" parameter.
     new d61203c  Merge 1.1.0 changes back to master.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/resources/org/apache/guacamole/protocols/ssh.json        | 4 ++++
 guacamole/src/main/webapp/translations/en.json                        | 1 +
 2 files changed, 5 insertions(+)

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

Posted by vn...@apache.org.

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 d61203c5ed7bb722076175bbbe77ef3c83617ac4
Merge: 1623f55 4f55001
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Fri May 10 10:09:23 2019 -0400

    Merge 1.1.0 changes back to master.

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