Merge remote-tracking branch 'football/master'

# Conflicts:
#	acp/matches_module.php
#	adm/style/acp_football_leagues.html
#	adm/style/acp_football_matches.html
#	block/all_bets.php
#	block/rank_matchday.php
#	block/ranks_total.php
#	config/services.yml
#	controller/main.php
#	event/main_listener.php
#	includes/constants.php
#	includes/functions.php
#	language/de/football.php
#	language/de/info_acp_leagues.php
#	language/de/info_acp_matches.php
#	styles/prosilver/template/all_bets.html
#	styles/prosilver/template/results.html
#	styles/prosilver/template/table.html
#	styles/prosilver/theme/football.css
This commit is contained in:
2023-06-07 20:40:33 +02:00
167 changed files with 12199 additions and 12181 deletions

View File

@@ -16,7 +16,6 @@ global $table_prefix;
// Config constants
define('FOOTB_BETS', $table_prefix . 'footb_bets');
define('FOOTB_CORR', $table_prefix . 'footb_corr');
define('FOOTB_EXTRA_BETS', $table_prefix . 'footb_extra_bets');
define('FOOTB_EXTRA', $table_prefix . 'footb_extra');
define('FOOTB_LEAGUES', $table_prefix . 'footb_leagues');
@@ -47,4 +46,3 @@ define('LEAGUE_KO', 2);
define('FOOTB_BONUS_DAY', $table_prefix . 'footb_bonuspoints_day');
define('FOOTB_CORR', $table_prefix . 'footb_corr');
?>