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