Google Git
Sign in
apache / guacamole-client / 5ff81f7735798c3804097d97f7422f03ba769379
commit5ff81f7735798c3804097d97f7422f03ba769379[log] [tgz]
authorMichael Jumper <mjumper@apache.org>Mon Sep 09 18:57:01 2019 -0700
committerMichael Jumper <mjumper@apache.org>Mon Sep 09 18:57:01 2019 -0700
tree2c63504b911f1609a239e7841fa7ec5d672be813
parent7a68a78a894f5ba8c3ff1611541a12065124904b [diff]
parent981adc94e6eeac6bc86934800ea0f1d597f4a899 [diff]
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
tree: 2c63504b911f1609a239e7841fa7ec5d672be813
  1. doc/
  2. extensions/
  3. guacamole/
  4. guacamole-common/
  5. guacamole-common-js/
  6. guacamole-docker/
  7. guacamole-ext/
  8. .dockerignore
  9. .gitignore
  10. CONTRIBUTING
  11. Dockerfile
  12. LICENSE
  13. NOTICE
  14. pom.xml
  15. project-assembly.xml
  16. README