Merge branch 'master' into next
authorMarcel Werk <burntime@woltlab.com>
Sun, 5 Jan 2020 22:04:34 +0000 (23:04 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sun, 5 Jan 2020 22:04:34 +0000 (23:04 +0100)
commit3ab6efab982044e1ac4f54302df6166bb901bc06
tree138bc0c7790186b79d87773cc4dd3f9434b82fb3
parentd821ce73c4f42c7802bca393a87e0a45dee0ff6e
parent9a537c0830c9bc5cb9da364b7f2b166a471c68d1
Merge branch 'master' into next
com.woltlab.wcf/mediaProvider.xml
wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php