php-phpbb

mirror of https://github.com/phpbb/phpbb.git synced 2025-02-22 10:57:56 +01:00

Go to file

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

build

Merge branch 'develop-olympus' into develop

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

code_sniffer/phpbb

…

git-tools

Merge remote branch 'igorw/ticket/9806' into develop-olympus

2011-03-20 22:31:14 +01:00

phpBB

Merge branch 'develop-olympus' into develop

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