Skip to content

Commit

Permalink
Merge branch '2.7' into 2.8
Browse files Browse the repository at this point in the history
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
  • Loading branch information
xabbuh committed Jan 4, 2016
2 parents 46ff6f1 + 9718832 commit 10ae1f0
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions contributing/code/core_team.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,13 @@ Active Core Members

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

* **Christian Flothmann** (`xabbuh`_) can merge into the Yaml_ component.

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

* **Jordi Boggiano** (`seldaek`_);
* **Lukas Kahwe Smith** (`lsmith77`_);
* **Ryan Weaver** (`weaverryan`_);
* **Christian Flothmann** (`xabbuh`_).
* **Ryan Weaver** (`weaverryan`_).

Core Membership Application
~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -153,6 +154,7 @@ discretion of the **Project Leader**.
.. _Config: https://github.com/symfony/config
.. _Console: https://github.com/symfony/console
.. _Debug: https://github.com/symfony/debug
.. _DebugBundle: https://github.com/symfony/debug-bundle
.. _DependencyInjection: https://github.com/symfony/dependency-injection
.. _DoctrineBridge: https://github.com/symfony/doctrine-bridge
.. _EventDispatcher: https://github.com/symfony/event-dispatcher
Expand All @@ -174,7 +176,7 @@ discretion of the **Project Leader**.
.. _TwigBridge: https://github.com/symfony/twig-bridge
.. _Validator: https://github.com/symfony/validator
.. _VarDumper: https://github.com/symfony/var-dumper
.. _DebugBundle: https://github.com/symfony/debug-bundle
.. _Yaml: https://github.com/symfony/yaml
.. _`fabpot`: https://github.com/fabpot/
.. _`webmozart`: https://github.com/webmozart/
.. _`Tobion`: https://github.com/Tobion/
Expand Down

0 comments on commit 10ae1f0

Please sign in to comment.