Skip to content
Snippets Groups Projects
Commit deaa6d34 authored by Steffen Neumann's avatar Steffen Neumann
Browse files

Fix merge conflicts with todays master

parent 2ab2dcdb
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 15 additions and 8 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