Commit ed60e361 authored by Michael's avatar Michael
Browse files

Merge branch '1.6' into 'master'

Merge branch 'master' into '1.6'

See merge request !6
parents 503fb755 91f5f912
Markdown is supported
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