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
1 merge request!188Resolve "Improve new layout"