camellan 775c4a23f0 fix conflict il y a 6 ans
..
de a106472900 - fixed the Edit -> Conversion -> Join ... functions (merge() functions) il y a 6 ans
en a106472900 - fixed the Edit -> Conversion -> Join ... functions (merge() functions) il y a 6 ans
ro a106472900 - fixed the Edit -> Conversion -> Join ... functions (merge() functions) il y a 6 ans
ru 775c4a23f0 fix conflict il y a 6 ans