Skip to content
Commit a5199283 authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

Merge branch '3.6.1-dev' into 'master' 

3.6.1 dev

See merge request !19
parents 8a244c24 19ea77f9
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