Michael Jumper 5ff81f7735 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

2019-09-09 18:57:01 -07:00

..

src

Merge 1.1.0 changes back to master.

2019-09-09 18:57:01 -07:00

.gitignore

GUACAMOLE-96: Add skeleton TOTP authentication extension (hard-coded, fake TOTP).

2018-02-04 19:45:17 -08:00

pom.xml

GUACAMOLE-736: Replace JAXB DatatypeConverter with Guava BaseEncoding.

2019-02-21 17:09:44 -05:00