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

Merge branch '2.5' into 2.6

parents 0d73614f 4c55bebe
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 5 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