Skip to content
Snippets Groups Projects
Verified Commit c82e52ff authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Resolve merge conflicts

parents 4999abf1 a7665dd6
No related branches found
No related tags found
1 merge request!146Resolve "Add licence information page"
Pipeline #1406 failed
Stage: test
Stage: build
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 5193 additions and 1072 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