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

Merge branch '2.5' into 2.x

parents 88e3f339 9327ad40
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 6 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