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 e02dcf8c84f0f7f2f9c866b0258bde0551c847b9
Merge: d61203c 863147e
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Fri May 10 11:04:19 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 | 2 ++
3 files changed, 10 insertions(+)
