Skip to content
Snippets Groups Projects
Commit a0363409 authored by Christopher Cottier's avatar Christopher Cottier
Browse files

settled merge conflicts

parents f0176d4a 91cbb5a3
1 merge request!25Afp 46/order confirmation page
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