Skip to content
Snippets Groups Projects
Commit b3cf2dca authored by Jan David Mol's avatar Jan David Mol
Browse files

Merged master into working copy, fixed merge conflicts.

parents 1fce05d2 0ff6210e
No related branches found
No related tags found
1 merge request!5Create a branch that contains the only working copy as of 2020-12-7
This commit is part of merge request !5. Comments created here will be created in the context of that merge request.
Show whitespace changes
Inline Side-by-side
Showing
with 98 additions and 69 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment