Skip to content

Commit d38ddd1

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: Update care team members [Validator] Use seealso instead of tip for File
2 parents 5c64519 + ff0deb9 commit d38ddd1

File tree

2 files changed

+24
-5
lines changed

2 files changed

+24
-5
lines changed

contributing/code_of_conduct/care_team.rst

+23-4
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,36 @@ Here are all the members of the CARE team (in alphabetic order). You can contact
2323
any of them directly using the contact details below or you can also contact all
2424
of them at once by emailing **[email protected]**:
2525

26-
* **Emilie Lorenzo**
26+
* **Timo Bakx**
2727

28-
* *E-mail*: emilie.lorenzo [at] symfony.com
29-
* *Twitter*: `@EmilieLorenzo <https://twitter.com/EmilieLorenzo>`_
30-
* *SymfonyConnect*: `emilielorenzo <https://connect.symfony.com/profile/emilielorenzo>`_
28+
* *E-mail*: timobakx [at] gmail.com
29+
* *Twitter*: `@TimoBakx <https://twitter.com/TimoBakx>`_
30+
* *SymfonyConnect*: `timobakx <https://connect.symfony.com/profile/timobakx>`_
31+
* *SymfonySlack*: `@Timo Bakx <https://symfony-devs.slack.com/team/U3FQ2GVJA>`_
32+
33+
* **Zan Baldwin**
34+
35+
* *E-mail*: hello [at] zanbaldwin.com
36+
* *Twitter*: `@ZanBaldwin <https://twitter.com/ZanBaldwin>`_
37+
* *SymfonyConnect*: `zanbaldwin <https://connect.symfony.com/profile/zanbaldwin>`_
38+
39+
* **Valentine Boineau**
40+
41+
* *E-mail*: valentine.boineau [at] gmail.com
42+
* *Twitter*: `@BoineauV <https://twitter.com/BoineauV>`_
43+
44+
* **Magali Milbergue**
45+
46+
* *E-mail*: magali.milbergue [at] gmail.com
47+
* *Twitter*: `@magalimilbergue <https://twitter.com/magalimilbergue>`_
48+
* *SymfonyConnect*: `magali_milbergue <https://connect.symfony.com/profile/magali_milbergue>`_
3149

3250
* **Tobias Nyholm**
3351

3452
* *E-mail*: tobias.nyholm [at] gmail.com
3553
* *Twitter*: `@tobiasnyholm <https://twitter.com/tobiasnyholm>`_
3654
* *SymfonyConnect*: `tobias <https://connect.symfony.com/profile/tobias>`_
55+
* *SymfonySlack*: `@Tobias Nyholm <https://symfony-devs.slack.com/team/U3A9CNEDB>`_
3756

3857
About the CARE Team
3958
-------------------

reference/constraints/File.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Validates that a value is a valid "file", which can be one of the following:
1111
This constraint is commonly used in forms with the :doc:`FileType </reference/forms/types/file>`
1212
form field.
1313

14-
.. tip::
14+
.. seealso::
1515

1616
If the file you're validating is an image, try the :doc:`Image </reference/constraints/Image>`
1717
constraint.

0 commit comments

Comments
 (0)