Nick Couchman 00d464b511 Merge 0.9.14 changes back to master.

2018-01-05 10:41:40 -05:00

..

org/apache/guacamole/auth/jdbc

GUACAMOLE-394: Disambiguate "user_id" column, now that connection query joins the connection history table.

2017-12-11 23:51:57 -08:00

guac-manifest.json

Merge 0.9.14 changes back to master.

2018-01-01 16:29:38 -05:00