projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4452c87 a89e260)
Merge branch '3.0' into 3.1
authorMarcel Werk <burntime@woltlab.com>
Tue, 10 Mar 2020 10:35:00 +0000 (11:35 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 10 Mar 2020 10:35:00 +0000 (11:35 +0100)
1  2 
com.woltlab.wcf/page.xml patch | diff1 | diff2 | blob | history

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