[guacamole-server] branch staging/1.2.0 updated (e526174 -> 32723d2)

[mj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mjumper pushed a change to branch staging/1.2.0
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git.


    from e526174  GUACAMOLE-474: Merge support for selectively disabling file uploads and downloads.
     add 42e223f  GUACAMOLE-474: Correct variable name and scope errors in RDP fs code.
     new 32723d2  GUACAMOLE-474: Merge corrections to file upload/download build failures.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

[guacamole-server] 01/01: GUACAMOLE-474: Merge corrections to file upload/download build failures.

[mj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mjumper pushed a commit to branch staging/1.2.0
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git

commit 32723d229fbff8eb45725383f571e4ec4f3b80c2
Merge: e526174 42e223f
Author: Mike Jumper <mj...@apache.org>
AuthorDate: Mon Jun 8 10:40:05 2020 -0700

    GUACAMOLE-474: Merge corrections to file upload/download build failures.

 src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)