php-phpbb

mirror of https://github.com/phpbb/phpbb.git synced 2025-09-14 18:14:17 +02:00

Go to file

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

build

Merge branch 'develop-olympus' into develop

2011-11-21 01:08:43 +01:00

code_sniffer/phpbb

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

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