aboutsummaryrefslogtreecommitdiff
path: root/vendors/dokuwiki/inc/lang/de/conflict.txt
AgeCommit message (Expand)Author
2011-10-13Rename lib/dokuwiki to vendors/dokuwikisembrestels