Skip to content
Commit 68c5ec1a authored by Nadia Matuschek's avatar Nadia Matuschek
Browse files

Merge branch 'release_6.x' into 'master' 

Release 6.x

See merge request !14
parents 5db00668 80dea6bd
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