Merge branch '2.3' into 2.4

symfony · Jun 9, 2014 · 5a4eb57 · 5a4eb57
2 parents 3ddbe1b + 351b2cf
commit 5a4eb57
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/_exts b/_exts
diff --git a/components/form/form_events.rst b/components/form/form_events.rst
@@ -263,7 +263,6 @@ processed.
 +------------------------+-------------------------------+------------------+
 
 .. versionadded:: 2.3
-
     Before Symfony 2.3, ``FormEvents::PRE_SUBMIT``, ``FormEvents::SUBMIT``
     and ``FormEvents::POST_SUBMIT`` were called ``FormEvents::PRE_BIND``,
     ``FormEvents::BIND`` and ``FormEvents::POST_BIND``.
+1 −0		.gitignore
+8 −3		README.md
+6 −3		composer.json
+0 −1		sensio/sphinx/configurationblock.py
+3 −4		sensio/sphinx/phpcode.py