mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into feature/avatars

Browse Source 
Conflicts:
	phpBB/install/database_update.php
This commit is contained in:
Marc Alexander
2012-12-09 21:02:31 +01:00
parent 26bde05a30 3fe381eed5
commit 1aae72961a
173 changed files with 3806 additions and 936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/develop/generate_utf_casefold.php
View File

@@ -111,7 +111,7 @@ function my_var_export($var)
* Download a file to the develop/ dir
*
* @param string $url URL of the file to download
* @return void
* @return null
*/
function download($url)
{

2
phpBB/develop/generate_utf_confusables.php
View File

@@ -199,7 +199,7 @@ function my_var_export($var)
* Download a file to the develop/ dir
*
* @param string $url URL of the file to download
* @return void
* @return null
*/
function download($url)
{

2
phpBB/develop/generate_utf_tables.php
View File

@@ -481,7 +481,7 @@ function my_var_export($var)
* Download a file to the develop/ dir
*
* @param string $url URL of the file to download
* @return void
* @return null
*/
function download($url)
{

2
phpBB/develop/utf_normalizer_test.php
View File

@@ -222,7 +222,7 @@ die("\n\nALL TESTS PASSED SUCCESSFULLY\n");
* Download a file to the develop/ dir
*
* @param string $url URL of the file to download
* @return void
* @return null
*/
function download($url)
{