Merge branch '3.1' into 5.2
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 20 May 2020 13:09:48 +0000 (15:09 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 20 May 2020 13:09:48 +0000 (15:09 +0200)
commitce88781915012d2848a5520cb23944c90ab025d6
tree2c54a5d74a9f95319e8aecb97b697981c9e1b3f3
parent02a930a97ae4bc852dc80963901868e633a4fad6
parentde4e930446dcff76d069ef67086293d864b55813
Merge branch '3.1' into 5.2
wcfsetup/install/files/acp/templates/boxList.tpl
wcfsetup/install/files/acp/templates/menuList.tpl