Resolve "Re-work login and registration views based on new landing page design" (!23) · Merge requests · nmaas / nmaas Portal · GitLab

Snippets Groups Projects

Merged Joanna Kaźmierczak requested to merge 217-re-work-login-and-registration-views-based-on-new-landing-page-design into develop 10 months ago

Viewing commit 97f35150

Show latest version

15 files

+ 242

− 168

97f35150

Merge branch 'develop' into... · 97f35150

Joanna Kaźmierczak authored 9 months ago

Merge branch 'develop' into 217-re-work-login-and-registration-views-based-on-new-landing-page-design

# Conflicts:
#	src/app/welcome/welcome.component.html

docker/config.template.json

+ 2

− 1

@@ -9,5 +9,6 @@
	},
	"captchaKey": "${CAPTCHA_KEY}",
    "showGitInfo": true,
    "showChangelog": true
    "showChangelog": true,
	"landing" :"${LANDING_PROFILE}"
}