Skip to content
Commit c496e130 authored by cake17's avatar cake17
Browse files

[fr] fix merge conflicts

parents 807b9565 95127ef4
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