Skip to content
Commit 4b65db23 authored by Nadia Matuschek's avatar Nadia Matuschek
Browse files

Merge branch 'release_6.x' into 'master' 

Release 6.x

See merge request !9
parents a2636278 2257cbbb
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