1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-04 16:06:00 +02:00

Merge branch '3.2.x'

Conflicts:
	phpBB/includes/ucp/ucp_notifications.php
This commit is contained in:
Oliver Schramm 2017-10-05 15:14:58 +02:00
commit 8e62ea225e

View File

@ -205,7 +205,7 @@ class ucp_notifications
}
$template->assign_vars(array(
strtoupper($block) . '_COLS' => count($notification_methods) + 2,
strtoupper($block) . '_COLS' => count($notification_methods) + 1,
));
}