projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b963667 680265f)
Merge branch 'master' into password-security
authorAlexander Ebert <ebert@woltlab.com>
Wed, 5 Aug 2020 22:41:55 +0000 (00:41 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 5 Aug 2020 22:41:55 +0000 (00:41 +0200)
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)