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

Merge remote-tracking branch 'weblate/master' 



Fix conflicts.

signed-off-by: default avatarHannu Nyman <hannu.nyman@iki.fi>
parents ae13dcfe 5d66e288
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