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 2020/03/09 09:45:36 UTC

[guacamole-client] branch master updated (d3043fd -> 3b97349)

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 d3043fd  Merge staging/1.2.0 changes back to master.
     add b826980  GUACAMOLE-901: Add translation and parameter definition for Belgian French layout.
     add 5e6d929  GUACAMOLE-901: Merge add translation and parameter definition for Belgian French layout.
     new 3b97349  Merge staging/1.2.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:
 guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json | 1 +
 guacamole/src/main/webapp/translations/en.json                           | 1 +
 2 files changed, 2 insertions(+)

[guacamole-client] 01/01: Merge staging/1.2.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 3b97349f055b064c8994c7a2ac3f0cfd6ed39e27
Merge: d3043fd 5e6d929
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Mon Mar 9 05:44:59 2020 -0400

    Merge staging/1.2.0 changes back to master.

 guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json | 1 +
 guacamole/src/main/webapp/translations/en.json                           | 1 +
 2 files changed, 2 insertions(+)