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 c2697fa4ab27f4709b0c29c20d0d3b3afa4c9a7f Merge: a0b2d1f1b 4c24bfd18 Author: James Muehlner <[email protected]> AuthorDate: Tue Jan 30 17:16:16 2024 +0000 Merge 1.5.5 changes back to master. extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-header/src/main/resources/guac-manifest.json | 2 +- .../guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json | 2 +- .../src/main/resources/guac-manifest.json | 2 +- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-json/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json | 2 +- .../guacamole-auth-quickconnect/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json | 2 +- .../guacamole-auth-sso-cas/src/main/resources/guac-manifest.json | 2 +- .../guacamole-auth-sso-openid/src/main/resources/guac-manifest.json | 2 +- .../guacamole-auth-sso-saml/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json | 2 +- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-vault-ksm/src/main/resources/guac-manifest.json | 2 +- .../src/main/java/org/apache/guacamole/extension/ExtensionModule.java | 3 ++- 16 files changed, 17 insertions(+), 16 deletions(-)
