This is an automated email from the ASF dual-hosted git repository.
vnick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit e58101997ff6af6e2b58347e92464038c607090d
Merge: 339c920 7fd9bf4
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Mon Aug 19 08:17:29 2019 -0400
Merge 1.1.0 changes back to master.
.../webapp/app/form/directives/guacInputColor.js | 123 ++--------
.../webapp/app/form/services/colorPickerService.js | 268 +++++++++++++++++++++
.../main/webapp/app/form/services/formService.js | 37 ++-
.../webapp/app/form/templates/guacInputColor.html | 3 +-
4 files changed, 325 insertions(+), 106 deletions(-)
