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

Merge branch 'develop' into...

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

# Conflicts:
#	src/app/welcome/welcome.component.html
parents 2d68a96d 7a2468d3
No related branches found
No related tags found
1 merge request!23Resolve "Re-work login and registration views based on new landing page design"
Showing
with 242 additions and 168 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment