projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 733251b 1538918)
Merge branch '5.2' into 5.3
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 16 Feb 2021 08:18:58 +0000 (09:18 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 16 Feb 2021 08:18:58 +0000 (09:18 +0100)
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)