Merge 0.9.13-incubating changes back to master.
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/372635a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/372635a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/372635a7 Branch: refs/heads/master Commit: 372635a72de4e0672f06fc7a978610e7ac59e55f Parents: 18effb2 04c70c7 Author: Michael Jumper <mjum...@apache.org> Authored: Fri Jun 23 14:38:32 2017 -0700 Committer: Michael Jumper <mjum...@apache.org> Committed: Fri Jun 23 14:38:32 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(-) ----------------------------------------------------------------------
