aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_install.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-12-13 16:35:55 +0100
committerNils Adermann <naderman@naderman.de>2010-12-13 16:35:55 +0100
commitadfa1656fb9d8b5bb601af1d7a6720884954d87a (patch)
treeabcd16b98d59f11c4362bafe23fbb9c15ae1ed72 /phpBB/includes/functions_install.php
parentbd579c837490a52cb5b8ce9493e2f066bfe4d8a5 (diff)
parentaf5b9a96409d788733fcb1ff367e0c7fb0583702 (diff)
downloadforums-adfa1656fb9d8b5bb601af1d7a6720884954d87a.tar
forums-adfa1656fb9d8b5bb601af1d7a6720884954d87a.tar.gz
forums-adfa1656fb9d8b5bb601af1d7a6720884954d87a.tar.bz2
forums-adfa1656fb9d8b5bb601af1d7a6720884954d87a.tar.xz
forums-adfa1656fb9d8b5bb601af1d7a6720884954d87a.zip
Merge branch 'ticket/igorw/9556' into develop
* ticket/igorw/9556: [ticket/9556] Drop php closing tags, add trailing newline Conflicts: phpBB/includes/constants.php
Diffstat (limited to 'phpBB/includes/functions_install.php')
-rw-r--r--phpBB/includes/functions_install.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 992e8d6bb0..4746b2f6e1 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -555,5 +555,3 @@ function adjust_language_keys_callback($matches)
return (!empty($lang[$matches[1]])) ? $db->sql_escape($lang[$matches[1]]) : $db->sql_escape($matches[1]);
}
}
-
-?> \ No newline at end of file