projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a29aad 733cee2)
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
authorMarcel Werk <burntime@woltlab.com>
Fri, 6 Apr 2018 09:54:48 +0000 (11:54 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 6 Apr 2018 09:54:48 +0000 (11:54 +0200)
1  2 
com.woltlab.wcf/option.xml patch | diff1 | diff2 | blob | history

diff --cc com.woltlab.wcf/option.xml
Simple merge
WoltLab Suite Core (previously WoltLab Community Framework)