This is an automated email from the ASF dual-hosted git repository.

jmuehlner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git

commit 6a8ffa0acf3c6ef35787feb365f13653e14d85f5
Merge: 02ef3ae 8b04414
Author: James Muehlner <[email protected]>
AuthorDate: Thu Aug 8 20:54:09 2019 -0700

    Merge 1.1.0 changes back to master.

 .../app/client/controllers/clientController.js     |  40 +++++-
 .../main/webapp/app/client/templates/client.html   |   8 ++
 .../webapp/app/client/types/ManagedArgument.js     | 152 +++++++++++++++++++++
 .../main/webapp/app/client/types/ManagedClient.js  | 116 +++++++++++++++-
 4 files changed, 308 insertions(+), 8 deletions(-)


Reply via email to