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 fd2c5b925914fa6f2c5e8ae65e640cb5d056202c
Merge: 65b4722 39defa2
Author: Nick Couchman <vn...@apache.org>
AuthorDate: Thu Jan 16 15:06:56 2020 -0500
Merge staging/1.1.0 changes back to master.
configure.ac | 20 +++++++++++++++++++-
src/protocols/rdp/Makefile.am | 2 +-
2 files changed, 20 insertions(+), 2 deletions(-)
