This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1749
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit a9a4c9da9b89e81b9600815229d0a0c7b202c9b2
Merge: d681f82 03fd607
Author: Dmytro_Gnatyshyn <di1...@ukr.net>
AuthorDate: Mon Jul 13 11:00:02 2020 +0300
Merge branch 'DLAB-1750' into DLAB-1749
# Conflicts:
#
services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/index.ts
#
services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
#
services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
.../exploratory/install-libraries/index.ts | 6 +-
.../install-libraries.component.html | 44 ++++++++---
.../install-libraries.component.scss | 76 +++++++++++++++++-
.../install-libraries.component.ts | 91 +++++++++++++++++++++-
4 files changed, 201 insertions(+), 16 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
