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 1b48f21573e1c07bcc39da9863e7f82036aaf7fc
Merge: 15bb363 ce106d6
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Sat Jun 15 17:16:40 2019 -0400
merge 1.1.0 changes back to master.
.../src/main/resources/org/apache/guacamole/protocols/rdp.json | 4 ----
.../src/main/resources/org/apache/guacamole/protocols/ssh.json | 4 ----
guacamole/src/main/webapp/translations/en.json | 1 -
3 files changed, 9 deletions(-)
