Skip to content
Unverified Commit 2d6179d1 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'master' into staging 

A few trivial conflicts due to *Platforms mass replace.
parents 2e7cb61c 9a56eee0
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