diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-09-05 00:40:59 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-09-05 00:40:59 +0200 |
| commit | 462355d6542e269b5da06c5a91f8d3a505723cd1 (patch) | |
| tree | 71b690e2cd7e89d190a884ea499dcf204df749cc /phpBB/phpbb/di | |
| parent | 8d6b03c438392cebed941491684ff835bf7136a8 (diff) | |
| parent | fcb94766150aafd5db692c47cdccc7a97950b7d4 (diff) | |
| download | forums-462355d6542e269b5da06c5a91f8d3a505723cd1.tar forums-462355d6542e269b5da06c5a91f8d3a505723cd1.tar.gz forums-462355d6542e269b5da06c5a91f8d3a505723cd1.tar.bz2 forums-462355d6542e269b5da06c5a91f8d3a505723cd1.tar.xz forums-462355d6542e269b5da06c5a91f8d3a505723cd1.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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:
build/build.xml
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/phpbb/di')
0 files changed, 0 insertions, 0 deletions