This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch next in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit f75d019fab71fd4df67b8ff327e47904f12d5d9f Merge: 07c2e56b5 ed54b5b12 Author: Virtually Nick <[email protected]> AuthorDate: Wed Sep 3 19:47:02 2025 -0400 Merge main branch changes to next. .../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(-)
