diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-21 01:08:43 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-21 01:08:43 +0100 |
| commit | c67ca0ac9903ee2ab018da49141d8d085073f41a (patch) | |
| tree | 462b5b51fa2265d262f3ef1f0a59e3faf58a2a02 /phpBB/includes/diff | |
| parent | d766ee3fe65924aa8379ef0672b2f52315415612 (diff) | |
| parent | a9d7b1f9a144a6354638e6ef30e42cec2463f1b8 (diff) | |
| download | forums-c67ca0ac9903ee2ab018da49141d8d085073f41a.tar forums-c67ca0ac9903ee2ab018da49141d8d085073f41a.tar.gz forums-c67ca0ac9903ee2ab018da49141d8d085073f41a.tar.bz2 forums-c67ca0ac9903ee2ab018da49141d8d085073f41a.tar.xz forums-c67ca0ac9903ee2ab018da49141d8d085073f41a.zip | |
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
Diffstat (limited to 'phpBB/includes/diff')
0 files changed, 0 insertions, 0 deletions