Skip to content
Commit 6b27ceb0 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge 'master' into staging and re-revert merge 

... from staging to master, reverted temporarily in aa9a0488.
parents 14c038dd b3bcb59b
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