Skip to content

Commit 545bf5b

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: Fix linebreak in Code line Fix link to Tobias' Github profile
2 parents 8fe5054 + ef666d3 commit 545bf5b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

components/translation/usage.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,8 @@ effect after removing the explicit rules:
328328
'{0} There are no apples|[20,Inf[ There are many apples|There is one apple|a_few: There are %count% apples'
329329
330330
For example, for ``1`` apple, the standard rule ``There is one apple`` will
331-
be used. For ``2-19`` apples, the second standard rule ``There are %count%
332-
apples`` will be selected.
331+
be used. For ``2-19`` apples, the second standard rule
332+
``There are %count% apples`` will be selected.
333333

334334
An :class:`Symfony\\Component\\Translation\\Interval` can represent a finite set
335335
of numbers:

contributing/code/core_team.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Active Core Members
8383
* **Maxime Steinhausser** (`ogizanagi`_) can merge into Config_, Console_,
8484
Form_, Serializer_, DependencyInjection_, and HttpKernel_ components;
8585

86-
* **Tobias Nyholm** (`Nyholm`) manages the official and contrib recipes
86+
* **Tobias Nyholm** (`Nyholm`_) manages the official and contrib recipes
8787
repositories;
8888

8989
* **Samuel Rozé** (`sroze`_) can merge into Messenger_ component.

0 commit comments

Comments
 (0)