projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e9acec 095eabf)
Merge pull request #1603 from joshuaruesweg/patch-4
authorAlexander Ebert <ebert@woltlab.com>
Wed, 12 Mar 2014 15:15:00 +0000 (16:15 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 12 Mar 2014 15:15:00 +0000 (16:15 +0100)
Replace "ignorieren" with "blockieren" in the acp

1  2 
wcfsetup/install/lang/de.xml patch | diff1 | diff2 | blob | history
wcfsetup/install/lang/en.xml patch | diff1 | diff2 | blob | history

diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
WoltLab Suite Core (previously WoltLab Community Framework)