conflicts resolved

This commit is contained in:
Marco Ciampa 1999-07-06 18:07:21 +00:00
parent b9962cf991
commit 5d8a4f4fc4

4091
po/it.po

File diff suppressed because it is too large Load Diff