Skip to content
Snippets Groups Projects
Commit 08de2d4e authored by kbeyro's avatar kbeyro
Browse files

Merge branch 'develop' into 1.5.3-develop 

# Conflicts:
#	build.gradle
#	build_and_publish.sh
#	src/app/appmarket/appinstance/appinstance.module.ts
#	src/app/appmarket/domains/domains.module.ts
#	src/app/appmarket/domains/list/domainslist.component.html
#	src/app/appmarket/domains/list/domainslist.component.ts
parents 74a53bb2 7724cac3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 418 additions and 25 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment