diff options
author | Andreas Fischer <bantu@phpbb.com> | 2013-07-13 19:30:57 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-13 19:30:57 +0200 |
commit | f514269846263fc1958ba28d702cd27d6efdb5b4 (patch) | |
tree | c1e13d2f4c4ff8370945e4694a7aa703f4907ad0 /phpBB/docs | |
parent | b607b3eab8b221056abf6f87901128bbe3f207b0 (diff) | |
parent | f14967fbff3988a352752c91d1c5268e3402235f (diff) | |
download | forums-f514269846263fc1958ba28d702cd27d6efdb5b4.tar forums-f514269846263fc1958ba28d702cd27d6efdb5b4.tar.gz forums-f514269846263fc1958ba28d702cd27d6efdb5b4.tar.bz2 forums-f514269846263fc1958ba28d702cd27d6efdb5b4.tar.xz forums-f514269846263fc1958ba28d702cd27d6efdb5b4.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[prep-release-3.0.12] More changelog items for the 3.0.12 release.
Diffstat (limited to 'phpBB/docs')
-rw-r--r-- | phpBB/docs/CHANGELOG.html | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 86fe51155d..97f8c40383 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -181,6 +181,8 @@ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11630">PHPBB3-11630</a>] - Improvements to the PHP lint pre-commit hook</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11644">PHPBB3-11644</a>] - Skip phpbb_dbal_order_lower_test on MySQL 5.6</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11662">PHPBB3-11662</a>] - "occured" should be "occurred"</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11670">PHPBB3-11670</a>] - Replace trademark ™ with ® on "Welcome to phpBB" install page</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11674">PHPBB3-11674</a>] - Do not include vendor folder if there are no dependencies.</li> </ul> <h4>Improvement</h4> <ul> @@ -228,6 +230,7 @@ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11527">PHPBB3-11527</a>] - Upgrade composer.phar to 1.0.0-alpha7</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11529">PHPBB3-11529</a>] - Rename RUNNING_TESTS file to .md file to render it on GitHub</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11576">PHPBB3-11576</a>] - Make phpBB Test Suite MySQL behave at least as strict as phpBB MySQL driver</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11671">PHPBB3-11671</a>] - Add phing/phing to composer.json</li> </ul> <a name="v3010"></a><h3>1.ii. Changes since 3.0.10</h3> |