Skip to content
Snippets Groups Projects
Commit a9121521 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Merge branch 'master' into 'develop' 

# Conflicts:
#   README.md
parents 5f0cf736 0d7c3d7b
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment