camellan 775c4a23f0 fix conflict 6 years ago
..
de a106472900 - fixed the Edit -> Conversion -> Join ... functions (merge() functions) 6 years ago
en a106472900 - fixed the Edit -> Conversion -> Join ... functions (merge() functions) 6 years ago
ro a106472900 - fixed the Edit -> Conversion -> Join ... functions (merge() functions) 6 years ago
ru 775c4a23f0 fix conflict 6 years ago