summaryrefslogtreecommitdiff
path: root/inc/lang/es/conflict.txt
Commit message (Expand)AuthorAge
* es language updateAndreas Gohr2005-07-26