Nathaniel Guse a01da0c1ee Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 ... Conflicts: phpBB/install/database_update.php		2013-02-26 15:32:27 -06:00
..
convertors	[ticket/11201] Revert WLM dropping because it is still used in China.	2013-02-04 01:31:43 +01:00
data	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
schemas	[feature/migrations] Revert unrelated change to schema_data.sql	2013-02-23 15:08:28 -06:00
database_update.php	[feature/migrations] Use the user class for language handling	2013-02-23 16:12:24 -06:00
index.php	[ticket/11305] Define hook finder as a service on the container.	2013-01-02 01:36:50 -05:00
install_convert.php	[ticket/10758] Dependency inject parameters into cache_moderators.	2012-12-15 16:50:28 -05:00
install_install.php	Merge remote-tracking branch 'EXreaction/feature/migrations-data' into develop	2013-02-26 14:20:12 -05: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 PR #1130 branch 'EXreaction/ticket/11259' into develop	2012-12-29 13:45:40 -05:00
phpinfo.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00