Andreas Fischer c67ca0ac99 Merge branch 'develop-olympus' into develop ... * develop-olympus: [develop-olympus] Increment version number to 3.0.11-dev in develop-olympus. [develop-olympus] Add changelog for 3.0.10-RC1 [develop-olympus] Bump version numbers for 3.0.10-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.10 releases. Conflicts: phpBB/includes/constants.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/imageset/imageset.cfg phpBB/styles/prosilver/style.cfg phpBB/styles/prosilver/template/template.cfg phpBB/styles/prosilver/theme/theme.cfg phpBB/styles/subsilver2/imageset/imageset.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/template.cfg phpBB/styles/subsilver2/theme/theme.cfg		2011-11-21 01:08:43 +01:00
..
convertors	[develop-olympus] Bumping version numbers to final for 3.0.10 releases.	2011-11-20 21:41:24 +01:00
data	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
schemas	[develop-olympus] Increment version number to 3.0.11-dev in develop-olympus.	2011-11-21 00:57:53 +01:00
database_update.php	Merge branch 'develop-olympus' into develop	2011-11-21 01:08:43 +01:00
index.php	[feature/extension-manager] Don't use the extension manager during install	2011-09-29 16:15:53 +02:00
install_convert.php	Merge branch 'develop-olympus' into develop	2011-11-18 18:07:58 +01:00
install_install.php	Merge branch 'develop-olympus' into develop	2011-11-20 18:45:56 +01:00
install_main.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
install_update.php	[feature/remove-db-styles] Removed database storage of style components.	2011-09-20 21:06:51 +01:00
phpinfo.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00