Skip to content
Snippets Groups Projects
Commit 12697f8c authored by Webster, Aidan (UG - Comp Sci & Elec Eng)'s avatar Webster, Aidan (UG - Comp Sci & Elec Eng)
Browse files

Merge branch 'registration-page' into 'base-layout' 

# Conflicts:
#   .gitignore
#   core/urls.py
parents deb734b5 e63dbaf3
No related branches found
No related tags found
2 merge requests!6Make user login and registration,!3Base layout
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment