Commit 3c7b05a9 authored by Lukáš Lalinský's avatar Lukáš Lalinský
Browse files

Merge branch 'stable' 

Conflicts:
	NEWS
parents 8e67b40b 009c4395
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment