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 d3043fd657457b20cd6d0edd775a9dd28c0f1453
Merge: 521990d 02aaf1d
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Sun Mar 8 21:47:18 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(+)
