Merge 1.0.0 changes back to master.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/d1e928be Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/d1e928be Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/d1e928be Branch: refs/heads/master Commit: d1e928bea79ca81c827e9b6adedabc98eefdf701 Parents: d67efba b0da0d1 Author: Michael Jumper <mjum...@apache.org> Authored: Wed Jun 27 21:04:33 2018 -0700 Committer: Michael Jumper <mjum...@apache.org> Committed: Wed Jun 27 21:04:33 2018 -0700 ---------------------------------------------------------------------- .../org/apache/guacamole/protocols/rdp.json | 4 ++++ .../org/apache/guacamole/protocols/ssh.json | 4 ++++ .../org/apache/guacamole/protocols/vnc.json | 4 ++++ guacamole/src/main/webapp/translations/en.json | 23 +++++++++++--------- 4 files changed, 25 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/d1e928be/guacamole/src/main/webapp/translations/en.json ----------------------------------------------------------------------
