Merge branch '2.4'

symfony · Feb 20, 2014 · cadca3b · cadca3b
2 parents 2cb2c2d + 77628d0
commit cadca3b
Show file tree

Hide file tree

Showing 4 changed files with 379 additions and 3 deletions.
diff --git a/contributing/code/_api_tagging.rst.inc b/contributing/code/_api_tagging.rst.inc
@@ -0,0 +1,7 @@
+.. note::
+
+    If you think that one of our regular classes should have an ``@api`` tag,
+    put your request into a `new ticket on GitHub`_. We will then evaluate
+    whether we can add the tag or not.
+
+.. _new ticket on GitHub: https://github.com/symfony/symfony/issues/new