projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ded94b7 ae55ba5)
Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Mon, 15 Jun 2020 16:25:16 +0000 (18:25 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 15 Jun 2020 16:25:16 +0000 (18:25 +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)