safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 1.1.0 changes back to master.

Browse Source 
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
This commit is contained in:
Michael Jumper
2019-09-09 18:57:01 -07:00
parent 7a68a78a89 981adc94e6
commit 5ff81f7735
18 changed files with 572 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json
View File

@@ -19,6 +19,7 @@
],
"translations" : [
"translations/de.json",
"translations/en.json",
"translations/es.json",
"translations/fr.json",