From: Matthias Schmidt Date: Wed, 24 Mar 2021 12:37:19 +0000 (+0100) Subject: Merge branch 'master' into ts_dbo_action X-Git-Tag: 5.4.0_Alpha_1~132^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=07203d83bad3758003beafd4ea2cdeb6bb95433e;p=GitHub%2FWoltLab%2FWCF.git Merge branch 'master' into ts_dbo_action --- 07203d83bad3758003beafd4ea2cdeb6bb95433e diff --cc wcfsetup/install/files/acp/templates/attachmentList.tpl index dfbf480c92,22d59a4457..6bccab96f2 --- a/wcfsetup/install/files/acp/templates/attachmentList.tpl +++ b/wcfsetup/install/files/acp/templates/attachmentList.tpl @@@ -3,9 -3,13 +3,9 @@@ {include file='imageViewer'}
diff --cc wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl index f276d2ada7,04fefc93e3..52b7f6daf9 --- a/wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl +++ b/wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl @@@ -1,8 -1,12 +1,8 @@@ {include file='header' pageTitle='wcf.acp.paidSubscription.user.list'} diff --cc wcfsetup/install/files/acp/templates/userTrophyList.tpl index ad8635a286,8dbdea322e..f5cbafbd20 --- a/wcfsetup/install/files/acp/templates/userTrophyList.tpl +++ b/wcfsetup/install/files/acp/templates/userTrophyList.tpl @@@ -1,11 -1,13 +1,9 @@@ {include file='header' pageTitle='wcf.acp.menu.link.userTrophy.list'}