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 4e3fbd9fe537e339cdba2d2062661b5d93da18a3 Merge: 002cfde 3199fdd Author: James Muehlner <[email protected]> AuthorDate: Thu Sep 16 19:37:54 2021 -0700 Merge 1.4.0 changes back to master. extensions/guacamole-auth-json/{ => doc}/README.md | 10 +++++----- extensions/guacamole-auth-json/src/main/assembly/dist.xml | 6 ++++++ .../org/apache/guacamole/properties/ByteArrayProperty.java | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-)
