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

Merge branch '2.x'

parents 72c04567 82bc6028
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 7 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