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/06/15 21:17:06 UTC

[guacamole-client] branch master updated (15bb363 -> 1b48f21)

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 15bb363  Merge 1.1.0 changes back to master.
     add 48ce083  GUACAMOLE-815: Remove duplicated "timezone" field definitions and translations.
     add ce106d6  GUACAMOLE-815: Merge remove duplicated "timezone" field definitions and translations.
     new 1b48f21  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/rdp.json        | 4 ----
 .../src/main/resources/org/apache/guacamole/protocols/ssh.json        | 4 ----
 guacamole/src/main/webapp/translations/en.json                        | 1 -
 3 files changed, 9 deletions(-)

[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 1b48f21573e1c07bcc39da9863e7f82036aaf7fc
Merge: 15bb363 ce106d6
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Sat Jun 15 17:16:40 2019 -0400

    merge 1.1.0 changes back to master.

 .../src/main/resources/org/apache/guacamole/protocols/rdp.json        | 4 ----
 .../src/main/resources/org/apache/guacamole/protocols/ssh.json        | 4 ----
 guacamole/src/main/webapp/translations/en.json                        | 1 -
 3 files changed, 9 deletions(-)