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

..

doc/example

GUACAMOLE-119: Add Apache license boilerplate to example config files.

2016-11-12 18:16:50 -08:00

src

Merge 1.1.0 changes back to master.

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

util

GUACAMOLE-699: Add helper script for verifying translations.

2019-01-12 16:36:58 -08:00

.gitignore

GUACAMOLE-119: Move NetBeans-specific .gitignore entries to guacamole project.

2016-11-12 18:16:54 -08:00

pom.xml

Merge 1.1.0 changes back to master.

2019-08-08 22:13:05 -07:00