Skip to content
Snippets Groups Projects
Commit 966f2d45 authored by b2-wilton's avatar b2-wilton
Browse files

Merge branch 'main' into 'brodybranch' 

# Conflicts:
#   myproject/myapp/payments.py
#   myproject/myapp/urls.py
parents 11d0e94f 6d6097c1
1 merge request!27Minor fixes from merge problems
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment