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-client.git
commit fbcb04e6709f72c2355d971ac7c6c58cbed8d162
Merge: 3c9f880 2140bed
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Thu Apr 25 16:42:57 2019 -0400
Merge 1.1.0 changes back to master.
.../guacamole/auth/jdbc/base/EntityMapper.xml | 46 ++++++++++++----------
1 file changed, 25 insertions(+), 21 deletions(-)
