Merge branch 'master' into next
authorMarcel Werk <burntime@woltlab.com>
Fri, 27 Sep 2019 14:29:26 +0000 (16:29 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 27 Sep 2019 14:29:26 +0000 (16:29 +0200)
commitbcdb2d67a0c54044c5f64aeff232b0c5dc4009cb
tree895a35585d132835a9ab793baa83278df9821bfc
parent01755e7de6e7dcc68f4fd9453b80b028310033b8
parent53d22471fbcda32a45b093ff745b02a4597e89de
Merge branch 'master' into next
wcfsetup/install/files/acp/templates/boxAdd.tpl
wcfsetup/install/files/lib/system/box/BoxHandler.class.php