Skip to content
Snippets Groups Projects
Commit b17e20ac authored by Anika Henke's avatar Anika Henke
Browse files

merged branch 'danny0838:rewrite_block' and resolved conflict

parent a8a3aa33
No related branches found
No related tags found
No related merge requests found
Loading
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