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 180c045ad910b6932f02d505630c5fbf1ac67d86 Merge: 2f30b6aad 3ad32215a Author: James Muehlner <[email protected]> AuthorDate: Sat Feb 4 00:55:20 2023 +0000 Merge 1.5.0 changes back to master. .../app/client/directives/guacClientUserCount.js | 45 +++++++++++++++++++++- .../src/app/client/styles/tiled-client-grid.css | 5 +++ .../app/client/templates/guacClientUserCount.html | 6 ++- .../src/main/frontend/src/translations/en.json | 9 +++-- 4 files changed, 58 insertions(+), 7 deletions(-)
