Skip to content
Snippets Groups Projects
Commit bb1fae7b authored by Martin Reinecke's avatar Martin Reinecke
Browse files

fix merge problems and adjust tests

parent d6d234bd
No related branches found
No related tags found
2 merge requests!210Merge nightly branch into master,!194Byebye zerocenter
Hide whitespace changes
Inline Side-by-side
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