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 b44db617773b0221833fd1bdbbce439a9fc58e67
Merge: 9ab3e85 c68a817
Author: Nick Couchman <nick.couch...@yahoo.com>
AuthorDate: Tue Nov 3 13:59:00 2020 -0500
Merge 1.3.0 changes back to master.
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/translations/ca.json | 11 +
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/translations/ca.json | 13 +
.../src/main/resources/translations/ca.json | 113 +++
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/translations/ca.json | 12 +
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/translations/ca.json | 18 +
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/translations/ca.json | 12 +
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/translations/ca.json | 12 +
.../src/main/resources/guac-manifest.json | 1 +
.../src/main/resources/translations/ca.json | 34 +
guacamole/src/main/webapp/translations/ca.json | 998 +++++++++++++++++++++
19 files changed, 1233 insertions(+)
