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

Merge branch '2.6' into 2.x

parents 43c8c5cb 93e2cacd
No related merge requests found
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