Skip to content
Snippets Groups Projects
Commit 3be8ef59 authored by Frederic Gurr's avatar Frederic Gurr :construction_worker:
Browse files

Merge branch 'master' into test_branch

Conflicts:
	README.md
parents c2f8f0e7 8cb15a34
No related branches found
No related tags found
No related merge requests found
Pipeline #8 passed
...@@ -2,4 +2,7 @@ ...@@ -2,4 +2,7 @@
This is some random text. This is some random text.
test_branch test_branch
\ No newline at end of file
master
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment