diff options
author | Andreas Fischer <bantu@phpbb.com> | 2011-12-04 00:24:22 +0100 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2011-12-04 00:24:22 +0100 |
commit | 138f123bd81bdd25bde28ca46a9ebf1673ffaecd (patch) | |
tree | 5f02c56a69994b7e74774645289fb30fdd8f6942 /phpBB/includes | |
parent | 9b9f30bbb94684a73309c6e2dac135f5fa80624c (diff) | |
parent | 69cbb4ac1de7887af8fe16a771ac30c762a7b24a (diff) | |
download | forums-138f123bd81bdd25bde28ca46a9ebf1673ffaecd.tar forums-138f123bd81bdd25bde28ca46a9ebf1673ffaecd.tar.gz forums-138f123bd81bdd25bde28ca46a9ebf1673ffaecd.tar.bz2 forums-138f123bd81bdd25bde28ca46a9ebf1673ffaecd.tar.xz forums-138f123bd81bdd25bde28ca46a9ebf1673ffaecd.zip |
Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
[prep-release-3.0.10] Bumping version number for 3.0.10-RC3.
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/includes')
0 files changed, 0 insertions, 0 deletions