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

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

commit 841b659a20e0b72f3b548ece5bde5556b1dc4ce1
Merge: a543db5 5de1063
Author: Michael Jumper <[email protected]>
AuthorDate: Fri Dec 24 14:52:16 2021 -0800

    Merge 1.4.0 changes back to master.

 .../frontend/src/app/index/filters/escapeFilter.js | 35 ++++++++++++++++++++++
 .../settings/templates/settingsConnections.html    |  4 +--
 .../app/settings/templates/settingsUserGroups.html |  4 +--
 .../src/app/settings/templates/settingsUsers.html  |  4 +--
 4 files changed, 41 insertions(+), 6 deletions(-)

Reply via email to