projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a06e32 7dc40d2)
Merge branch '5.3' into 5.4
authorMarcel Werk <burntime@woltlab.com>
Thu, 2 Sep 2021 13:55:21 +0000 (15:55 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 2 Sep 2021 13:55:21 +0000 (15:55 +0200)
1  2 
com.woltlab.wcf/mediaProvider.xml patch | diff1 | diff2 | blob | history

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