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 2021/12/12 12:31:22 UTC

[guacamole-client] branch master updated (588915d -> 137beac)

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 588915d  Merge 1.4.0 changes back to master.
     add 68dd871  GUACAMOLE-1064: Add Norwegian keymap parameter value and translation.
     add 7d92822  GUACAMOLE-1064: Merge add Norwegian keymap parameter value and translation.
     new 137beac  Merge 1.4.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/frontend/src/translations/en.json                     | 1 +
 2 files changed, 2 insertions(+)

[guacamole-client] 01/01: Merge 1.4.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 137beacaf72173976dda61cba2ce060a78a44c81
Merge: 588915d 7d92822
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Sun Dec 12 07:30:43 2021 -0500

    Merge 1.4.0 changes back to master.

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