This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit 27db57f704579dbc8e4a84cd869fbb55868720ed Merge: 90322cd 1f6f45e Author: Virtually Nick <[email protected]> AuthorDate: Fri Dec 24 19:24:36 2021 -0500 Merge 1.4.0 changes back to master. src/guacd/conf-file.c | 4 ++-- src/guacd/conf.h | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-)
