diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-09-05 00:37:40 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-09-05 00:37:40 +0200 |
| commit | fcb94766150aafd5db692c47cdccc7a97950b7d4 (patch) | |
| tree | 47852ed4ce11397f483b073ea2259803c3922ba0 /phpBB/phpbb/lock | |
| parent | f446afa06b3642a24a548699b69c5b7bc4a35edb (diff) | |
| parent | 50818a342bf60eba038b47af36f7ff32d3f7867a (diff) | |
| download | forums-fcb94766150aafd5db692c47cdccc7a97950b7d4.tar forums-fcb94766150aafd5db692c47cdccc7a97950b7d4.tar.gz forums-fcb94766150aafd5db692c47cdccc7a97950b7d4.tar.bz2 forums-fcb94766150aafd5db692c47cdccc7a97950b7d4.tar.xz forums-fcb94766150aafd5db692c47cdccc7a97950b7d4.zip | |
Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
[prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
[prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/phpbb/lock')
0 files changed, 0 insertions, 0 deletions