GUACAMOLE-323: Merge login help test for CAS.

Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/04c70c7e
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/04c70c7e
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/04c70c7e

Branch: refs/heads/staging/0.9.13-incubating
Commit: 04c70c7e49c555fa89023b1f7b090384bc06c8f4
Parents: 80b681e bc59074
Author: Michael Jumper <mjum...@apache.org>
Authored: Fri Jun 23 14:36:40 2017 -0700
Committer: Michael Jumper <mjum...@apache.org>
Committed: Fri Jun 23 14:36:40 2017 -0700

----------------------------------------------------------------------
 .../auth/cas/AuthenticationProviderService.java         |  5 +++--
 .../src/main/resources/guac-manifest.json               |  4 ++++
 .../src/main/resources/translations/en.json             | 12 ++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


Reply via email to