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

treewide: fix weblate conflicts 



Merge remote-tracking branch 'weblate/master'

Signed-off-by: default avatarHannu Nyman <hannu.nyman@iki.fi>
parents ad80b8be 6586e33f
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