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 25c87922d587f00243e7fb0b712663f336a2b8e2
Merge: a4495cf c643fe9
Author: Michael Jumper <mjum...@apache.org>
AuthorDate: Mon Aug 12 10:15:49 2019 -0700
Merge 1.1.0 changes back to master.
.../guacamole/auth/ldap/LDAPConnectionService.java | 16 +++---------
.../guacamole/auth/ldap/ObjectQueryService.java | 29 +++++++++++-----------
2 files changed, 17 insertions(+), 28 deletions(-)
