diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-08-01 17:32:32 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-08-01 17:32:32 +0200 |
| commit | d01c07c88701cc8e8bec6f19d5c015a4d1bc9e89 (patch) | |
| tree | 168efbb7b2fe1b5a5185cbc1eb08f0bd1659171e /code_sniffer/phpbb/Sniffs/Commenting | |
| parent | 9f60a3853964b45ab8fe6044ef3b42750f109c76 (diff) | |
| parent | 02b4f1c8745ffd62eb438019a36c4148bddca802 (diff) | |
| download | forums-d01c07c88701cc8e8bec6f19d5c015a4d1bc9e89.tar forums-d01c07c88701cc8e8bec6f19d5c015a4d1bc9e89.tar.gz forums-d01c07c88701cc8e8bec6f19d5c015a4d1bc9e89.tar.bz2 forums-d01c07c88701cc8e8bec6f19d5c015a4d1bc9e89.tar.xz forums-d01c07c88701cc8e8bec6f19d5c015a4d1bc9e89.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release.
[prep-release-3.0.12] Bumping version number for 3.0.12-RC2.
Conflicts:
build/build.xml
phpBB/install/database_update.php
Diffstat (limited to 'code_sniffer/phpbb/Sniffs/Commenting')
0 files changed, 0 insertions, 0 deletions