Skip to content
Snippets Groups Projects
Commit 7415f40b authored by Daniel Gerhardt's avatar Daniel Gerhardt
Browse files

Merge branch '2.6' into 2.x

parents f618ebe3 0d73614f
Branches
Pipeline #20397 passed with warnings with stages
in 1 minute and 18 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 1 deletion
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