Skip to content

Commit 10ae1f0

Browse files
committed
Merge branch '2.7' into 2.8
Conflicts: cookbook/form/create_custom_field_type.rst cookbook/form/dynamic_form_modification.rst reference/forms/types/date.rst reference/forms/types/options/placeholder.rst.inc
2 parents 46ff6f1 + 9718832 commit 10ae1f0

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

contributing/code/core_team.rst

+5-3
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,13 @@ Active Core Members
6767

6868
* **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ component.
6969

70+
* **Christian Flothmann** (`xabbuh`_) can merge into the Yaml_ component.
71+
7072
* **Deciders** (``@symfony/deciders`` on GitHub):
7173

7274
* **Jordi Boggiano** (`seldaek`_);
7375
* **Lukas Kahwe Smith** (`lsmith77`_);
74-
* **Ryan Weaver** (`weaverryan`_);
75-
* **Christian Flothmann** (`xabbuh`_).
76+
* **Ryan Weaver** (`weaverryan`_).
7677

7778
Core Membership Application
7879
~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -153,6 +154,7 @@ discretion of the **Project Leader**.
153154
.. _Config: https://github.com/symfony/config
154155
.. _Console: https://github.com/symfony/console
155156
.. _Debug: https://github.com/symfony/debug
157+
.. _DebugBundle: https://github.com/symfony/debug-bundle
156158
.. _DependencyInjection: https://github.com/symfony/dependency-injection
157159
.. _DoctrineBridge: https://github.com/symfony/doctrine-bridge
158160
.. _EventDispatcher: https://github.com/symfony/event-dispatcher
@@ -174,7 +176,7 @@ discretion of the **Project Leader**.
174176
.. _TwigBridge: https://github.com/symfony/twig-bridge
175177
.. _Validator: https://github.com/symfony/validator
176178
.. _VarDumper: https://github.com/symfony/var-dumper
177-
.. _DebugBundle: https://github.com/symfony/debug-bundle
179+
.. _Yaml: https://github.com/symfony/yaml
178180
.. _`fabpot`: https://github.com/fabpot/
179181
.. _`webmozart`: https://github.com/webmozart/
180182
.. _`Tobion`: https://github.com/Tobion/

0 commit comments

Comments
 (0)