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

Posted to commits@guacamole.apache.org by jm...@apache.org on 2022/03/31 21:40:25 UTC

[guacamole-client] 01/01: Merge changes from staging/1.5.0 back to master.

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 5a95861f02e8e8d6db8126df1bdc888509a3ac6e
Merge: 36e15e1 27494d7
Author: James Muehlner <ja...@guac-dev.org>
AuthorDate: Thu Mar 31 21:39:02 2022 +0000

    Merge changes from staging/1.5.0 back to master.

 .../connection/HistoryConnectionRecord.java        | 35 ++++++++++++++++++----
 .../directives/guacSettingsConnectionHistory.js    | 35 ++++++++++++++++++++--
 2 files changed, 62 insertions(+), 8 deletions(-)