php-phpbb

mirror of https://github.com/phpbb/phpbb.git synced 2025-02-22 19:07:27 +01:00

History

Andreas Fischer c6075003a3 Merge branch 'develop-olympus' into develop

* develop-olympus:
  [develop-olympus] Changelog: Changes since 3.0.8
  [develop-olympus] Bumping version number for 3.0.9-RC1.
  [develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9 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-06-12 22:27:29 +02:00

adm

Merge remote-tracking branch 'naderman/ticket/10198' into develop-olympus

2011-06-10 01:23:17 +02:00

cache

…

develop

Merge branch 'develop-olympus' into develop

2011-06-12 19:27:01 +02:00

docs

Merge branch 'develop-olympus' into develop

2011-06-12 22:27:29 +02:00