Skip to content
Snippets Groups Projects
Commit bb241bbb authored by Joanna Kaźmierczak's avatar Joanna Kaźmierczak
Browse files

Merge remote-tracking branch 'origin/develop' into 272-improve-new-layout

# Conflicts:
#	src/app/shared/admin/clusters/manager/manager.component.html
#	src/app/shared/admin/clusters/manager/manager.component.ts
parents f2a140dd 0a9c7e7b
No related branches found
No related tags found
2 merge requests!258Develop,!188Resolve "Improve new layout"
This commit is part of merge request !188. Comments created here will be created in the context of that merge request.
Showing
with 606 additions and 27 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment