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/823bbeac
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/823bbeac
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/823bbeac

Branch: refs/heads/master
Commit: 823bbeace11063b249e3f05c2a1e5c5027107b96
Parents: d4f58f2 001ece1
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Nov 9 20:26:05 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Fri Nov 9 20:26:05 2018 -0500

----------------------------------------------------------------------
 .../src/main/resources/translations/en.json                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


Reply via email to