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

Merge branch '2.7' into 2.x

parents 958d036b 07acc921
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 3 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