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/05/24 17:17:08 UTC

[guacamole-client] 01/01: Merge staging/1.2.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 e4aa6bd451ae8237d08a2d2a580fe1250b145f85
Merge: 9e8f3eb 4e4b6f2
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Sun May 24 13:13:34 2020 -0400

    Merge staging/1.2.0 changes back to master.

 guacamole/src/main/webapp/translations/fr.json | 446 +++++++++++++++++++++----
 1 file changed, 382 insertions(+), 64 deletions(-)