tree 2c63504b911f1609a239e7841fa7ec5d672be813
parent 7a68a78a894f5ba8c3ff1611541a12065124904b
parent 981adc94e6eeac6bc86934800ea0f1d597f4a899
author Michael Jumper <mjumper@apache.org> 1568080621 -0700
committer Michael Jumper <mjumper@apache.org> 1568080621 -0700

Merge 1.1.0 changes back to master.

Conflicts:

 * extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
 * extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
 * extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json
 * extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json
 * extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json
 * extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json
 * guacamole/src/main/webapp/translations/de.json