projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47619e6 a357afb)
Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Sun, 6 Jan 2019 14:33:54 +0000 (15:33 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 6 Jan 2019 14:33:54 +0000 (15:33 +0100)
1  2 
wcfsetup/install/files/acp/js/WCF.ACP.js patch | diff1 | diff2 | blob | history
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)