This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit ed54b5b12adf6d120109e9c134f527ef4a0b4e74 Merge: 99dbe07e9 47cab5966 Author: Virtually Nick <[email protected]> AuthorDate: Wed Sep 3 19:46:31 2025 -0400 Merge patch branch changes to main. .../activeconnection/ActiveConnectionObjectTranslator.java | 3 ++- .../rest/connection/ConnectionObjectTranslator.java | 3 ++- .../connectiongroup/ConnectionGroupObjectTranslator.java | 3 ++- .../guacamole/rest/directory/DirectoryObjectResource.java | 2 +- .../guacamole/rest/directory/DirectoryObjectTranslator.java | 7 ++++++- .../apache/guacamole/rest/directory/DirectoryResource.java | 13 +++++++------ .../rest/sharingprofile/SharingProfileObjectTranslator.java | 3 ++- .../apache/guacamole/rest/user/UserObjectTranslator.java | 6 +++--- .../java/org/apache/guacamole/rest/user/UserResource.java | 2 +- .../guacamole/rest/usergroup/UserGroupObjectTranslator.java | 3 ++- 10 files changed, 28 insertions(+), 17 deletions(-)
