Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 5e5abd3

Browse filesBrowse files
committed
Merge branch '2.4' into 2.5
* 2.4: Update twig_reference.rst Update version in Rework your Patch section
2 parents eed8d64 + 1ad82b6 commit 5e5abd3
Copy full SHA for 5e5abd3

File tree

Expand file treeCollapse file tree

2 files changed

+2
-2
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+2
-2
lines changed

‎contributing/code/patches.rst

Copy file name to clipboardExpand all lines: contributing/code/patches.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ Rework your Patch
364364

365365
Based on the feedback on the pull request, you might need to rework your
366366
patch. Before re-submitting the patch, rebase with ``upstream/master`` or
367-
``upstream/2.1``, don't merge; and force the push to the origin:
367+
``upstream/2.3``, don't merge; and force the push to the origin:
368368

369369
.. code-block:: bash
370370

‎reference/twig_reference.rst

Copy file name to clipboardExpand all lines: reference/twig_reference.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Symfony2 Twig Extensions
55
========================
66

77
Twig is the default template engine for Symfony2. By itself, it already contains
8-
a lot of build-in functions, filters, tags and tests (`http://twig.sensiolabs.org/documentation`_
8+
a lot of built-in functions, filters, tags and tests (`http://twig.sensiolabs.org/documentation`_
99
then scroll to the bottom).
1010

1111
Symfony2 adds more custom extension on top of Twig to integrate some components

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.