projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5e7da4 40dae3d)
Merge pull request #1672 from joshuaruesweg/patch-12
authorMarcel Werk <burntime@woltlab.com>
Mon, 3 Mar 2014 20:39:13 +0000 (21:39 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 3 Mar 2014 20:39:13 +0000 (21:39 +0100)
rename twitter options

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)