Merge branch '3.1' into 5.2
authorMarcel Werk <burntime@woltlab.com>
Mon, 18 Jan 2021 15:19:54 +0000 (16:19 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 18 Jan 2021 15:19:54 +0000 (16:19 +0100)
commit2812b8cbebe1c1dbf0abc65fd31d4e0b8f132dc4
tree30e37a3d4512611bfa7756d913988e38b324a85b
parentd0e41a0bee5deee20e25f880ef59737f8c62abca
parent54a147f1552b6d72f5c7a2d4b64bdb4d4e495253
Merge branch '3.1' into 5.2
wcfsetup/install/files/js/WoltLabSuite/Core/Media/Editor.js