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

merge master into x-updates (would-be fast-forward)

parents 2cf1f0b2 5d140488
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