Commit 1ef2213e authored by peturbg's avatar peturbg
Browse files

Merge remote-tracking branch 'master/master' into jordibgzashtita

parents 0d4a2156 0e283845
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