Skip to content
Snippets Groups Projects
Commit dd2a1c83 authored by sphere's avatar sphere
Browse files

Merge branch 'master' into 'next' 

merge master into next again

See merge request !1659
parents 00c50aea f97261ae
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