Skip to content
Commit a53164c8 authored by Hannu Nyman's avatar Hannu Nyman
Browse files

Merge remote-tracking branch 'weblate/master' 


Fix conflict.

Signed-off-by: default avatarHannu Nyman <hannu.nyman@iki.fi>
parents d6cd72fc 3297f2f4
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