camellan 775c4a23f0 fix conflict 7 lat temu
..
de a106472900 - fixed the Edit -> Conversion -> Join ... functions (merge() functions) 7 lat temu
en a106472900 - fixed the Edit -> Conversion -> Join ... functions (merge() functions) 7 lat temu
ro a106472900 - fixed the Edit -> Conversion -> Join ... functions (merge() functions) 7 lat temu
ru 775c4a23f0 fix conflict 7 lat temu