Nathaniel Guse 68363e362d Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 ...

Conflicts:
	phpBB/install/schemas/mssql_schema.sql
	phpBB/report.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html

2012-11-10 10:58:44 -06:00

..

convertors

…

data

…

schemas

Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103

2012-11-10 10:58:44 -06:00

database_update.php

Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103

2012-11-10 10:58:44 -06:00

index.php

[ticket/10780] Make L_COLON available in the installer.

2012-11-10 12:53:45 +01:00

install_convert.php

…

install_install.php

Merge remote-tracking branch 'igorw/ticket/11183' into develop

2012-11-10 14:02:45 +01:00

install_main.php

…

install_update.php

…

phpinfo.php

…