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:
@@ -1,4 +1,4 @@
|
||||
<!-- DEFINE $S_IN_FOOTBALL = 1 -->
|
||||
<!-- DEFINE $S_IN_FOOTBALL = 1 -->
|
||||
<!-- INCLUDE overall_header.html -->
|
||||
|
||||
<!-- IF S_FOOTBALL_INFO -->
|
||||
|
||||
Reference in New Issue
Block a user