projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99f6c08 dd68582)
Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 1 Mar 2017 11:16:07 +0000 (12:16 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 1 Mar 2017 11:16:07 +0000 (12:16 +0100)
# Conflicts:
# com.woltlab.wcf/package.xml
# wcfsetup/install/files/lib/system/WCF.class.php

1  2 
wcfsetup/install/files/lib/system/WCF.class.php patch | diff1 | diff2 | blob | history
wcfsetup/install/lang/de.xml patch | diff1 | diff2 | blob | history

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