Marc Alexander 7006db7a2d Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords ... Conflicts: phpBB/includes/functions.php		2013-10-03 10:04:59 +02:00
..
convertors	[develop-olympus] Bumping version numbers to final for 3.0.12 releases.	2013-07-12 21:10:05 +02:00
data	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
schemas	Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords	2013-09-27 10:47:10 +02:00
database_update.php	Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700	2013-09-16 01:24:05 +02:00
index.php	[ticket/11852] Split filesystem and path_helper into 2 classes	2013-09-26 15:34:44 +02:00
install_convert.php	[ticket/11700] Move all recent code to namespaces	2013-09-16 00:25:27 +02:00
install_install.php	[ticket/11700] Escape Backslashes from schema_data.sql for MySQLi	2013-09-25 12:02:01 +02:00
install_main.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
install_update.php	Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700	2013-09-16 01:24:05 +02:00
phpinfo.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00