You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@guacamole.apache.org by vn...@apache.org on 2019/05/14 01:37:48 UTC

[guacamole-client] 01/01: Merge 1.1.0 changes to master.

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 3b60f135b93fe376a95c1f2265189036119d34bd
Merge: e02dcf8 65a7802
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Mon May 13 21:37:17 2019 -0400

    Merge 1.1.0 changes to master.

 .../src/main/java/org/apache/guacamole/form/TimeZoneField.java      | 5 +++--
 .../src/main/resources/org/apache/guacamole/protocols/rdp.json      | 2 +-
 .../src/main/resources/org/apache/guacamole/protocols/ssh.json      | 2 +-
 .../src/main/webapp/app/form/controllers/timeZoneFieldController.js | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)