Skip to content
Snippets Groups Projects
Commit cc41409f authored by Pierre-antoine Comby's avatar Pierre-antoine Comby
Browse files

Merge branch 'master' into 'app_member' 

# Conflicts:
#   apps/member/views.py
parents 10f7ef40 b7059766
No related branches found
No related tags found
1 merge request!5App member
Pipeline #7666 passed with stage
in 2 minutes and 50 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 513 additions and 416 deletions
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