Skip to content
Commit 5e1253f4 authored by Jo-Philipp Wich's avatar Jo-Philipp Wich
Browse files

treewide: fix weblate merge conflicts 



Signed-off-by: default avatarJo-Philipp Wich <jo@mein.io>
parents 23b03caa 758e1362
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