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

..

schema

GUACAMOLE-220: Correct documentation of update script.

2018-09-27 20:15:23 -07:00

src/main

Merge 1.1.0 changes back to master.

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

.gitignore

GUACAMOLE-363: Initial commit of SQLServer authentication module for JDBC.

2017-09-28 07:00:51 -04:00

pom.xml

GUACAMOLE-729: Bump version numbers to 1.1.0.

2019-02-09 11:08:28 -08:00