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 02ef3ae2d89cdeb429c8b39bdbb584f724a59fb1
Merge: ed374fc 02dadfa
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Sat Aug 3 17:06:42 2019 -0400
Merge 1.1.0 changes back to master.
.../guacamole/environment/LocalEnvironment.java | 2 +-
.../org/apache/guacamole/protocols/kubernetes.json | 174 +++++++++++++++++++++
guacamole/src/main/webapp/app/index/styles/ui.css | 1 +
guacamole/src/main/webapp/translations/en.json | 68 +++++++-
4 files changed, 243 insertions(+), 2 deletions(-)
