Skip to content

Commit 147e546

Browse files
committed
Merge branch '2.7' of https://github.com/symfony/symfony-docs into 2.7
2 parents 038cc60 + 7a58612 commit 147e546

File tree

1 file changed

+29
-14
lines changed

1 file changed

+29
-14
lines changed

contributing/code/core_team.rst

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ Active Core Members
4949

5050
* **Mergers** (``@symfony/mergers`` on GitHub):
5151

52-
* **Bernhard Schussek** (`webmozart`_) can merge into the Form_,
53-
Validator_, Icu_, Intl_, Locale_, OptionsResolver_ and PropertyAccess_
54-
components;
55-
5652
* **Tobias Schultze** (`Tobion`_) can merge into the Routing_,
5753
OptionsResolver_ and PropertyAccess_ components;
5854

@@ -69,23 +65,37 @@ Active Core Members
6965
* **Kévin Dunglas** (`dunglas`_) can merge into the PropertyInfo_,
7066
Serializer_ component;
7167

72-
* **Abdellatif AitBoudad** (`aitboudad`_) can merge into the Translation_
73-
component;
74-
75-
* **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ component;
68+
* **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ and Intl_
69+
components;
7670

7771
* **Christian Flothmann** (`xabbuh`_) can merge into the Yaml_ component;
7872

79-
* **Javier Eguiluz** (`javiereguiluz`_) can merge into the WebProfilerBundle_
80-
bundle.
73+
* **Javier Eguiluz** (`javiereguiluz`_) can merge into the WebProfilerBundle_;
74+
75+
* **Grégoire Pineau** (`lyrixx`_) can merge into the Workflow_ component;
76+
77+
* **Ryan Weaver** (`weaverryan`_) can merge into the Security_ component and
78+
the SecurityBundle_;
8179

82-
* **Grégoire Pineau** (`lyrixx`_) can merge into the Workflow_ component.
80+
* **Robin Chalas** (`chalasr`_) can merge into the Console_ and Security_
81+
components and the SecurityBundle_;
82+
83+
* **Maxime Steinhausser** (`ogizanagi`_) can merge into Config_, Console_,
84+
Form_, Serializer_, DependencyInjection_, and HttpKernel_ components.
8385

8486
* **Deciders** (``@symfony/deciders`` on GitHub):
8587

8688
* **Jordi Boggiano** (`seldaek`_);
87-
* **Lukas Kahwe Smith** (`lsmith77`_);
88-
* **Ryan Weaver** (`weaverryan`_).
89+
* **Lukas Kahwe Smith** (`lsmith77`_).
90+
91+
Former Core Members
92+
~~~~~~~~~~~~~~~~~~~
93+
94+
They are no longer part of the Core Team, but we are very grateful for all their
95+
Symfony contributions:
96+
97+
* **Bernhard Schussek** (`webmozart`_);
98+
* **Abdellatif AitBoudad** (`aitboudad`_).
8999

90100
Core Membership Application
91101
~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -158,7 +168,6 @@ Symfony Core Rules and Protocol Amendments
158168
The rules described in this document may be amended at anytime at the
159169
discretion of the **Project Leader**.
160170

161-
162171
.. [1] Minor changes comprise typos, DocBlock fixes, code standards
163172
violations, and minor CSS, JavaScript and HTML modifications.
164173
@@ -178,6 +187,7 @@ discretion of the **Project Leader**.
178187
.. _HttpKernel: https://github.com/symfony/http-kernel
179188
.. _Icu: https://github.com/symfony/icu
180189
.. _Intl: https://github.com/symfony/intl
190+
.. _LDAP: https://github.com/symfony/ldap
181191
.. _Locale: https://github.com/symfony/locale
182192
.. _MonologBridge: https://github.com/symfony/monolog-bridge
183193
.. _OptionsResolver: https://github.com/symfony/options-resolver
@@ -187,6 +197,8 @@ discretion of the **Project Leader**.
187197
.. _Routing: https://github.com/symfony/routing
188198
.. _Serializer: https://github.com/symfony/serializer
189199
.. _Translation: https://github.com/symfony/translation
200+
.. _Security: https://github.com/symfony/security
201+
.. _SecurityBundle: https://github.com/symfony/security-bundle
190202
.. _Stopwatch: https://github.com/symfony/stopwatch
191203
.. _TwigBridge: https://github.com/symfony/twig-bridge
192204
.. _Validator: https://github.com/symfony/validator
@@ -209,3 +221,6 @@ discretion of the **Project Leader**.
209221
.. _`xabbuh`: https://github.com/xabbuh/
210222
.. _`javiereguiluz`: https://github.com/javiereguiluz/
211223
.. _`lyrixx`: https://github.com/lyrixx/
224+
.. _`chalasr`: https://github.com/chalasr/
225+
.. _`ogizanagi`: https://github.com/ogizanagi/
226+
.. _`csarrazi`: https://github.com/csarrazi/

0 commit comments

Comments
 (0)