[guacamole-client] branch master updated (c6a6d38 -> 2ea29c5)

[mj...@apache.org]

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

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


    from c6a6d38  Merge 1.3.0 changes back to master.
     add 1488bb6  GUACAMOLE-1081: Fix JUnit tests for token modifiers.
     add 61dce8b  GUACAMOLE-1081: Merge correction to token modifier case within TokenFilter unit tests.
     new 2ea29c5  Merge 1.3.0 changes back to master.

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/test/java/org/apache/guacamole/token/TokenFilterTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

[guacamole-client] 01/01: Merge 1.3.0 changes back to master.

[mj...@apache.org]

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

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

commit 2ea29c50c25286f0525cf2c6619865815d6a827c
Merge: c6a6d38 61dce8b
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Fri Oct 30 18:15:37 2020 -0700

    Merge 1.3.0 changes back to master.

 .../src/test/java/org/apache/guacamole/token/TokenFilterTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)