Commit 1cd7f3f0 authored by Fabien Potencier's avatar Fabien Potencier

merged branch dave1010/master (PR #676)

This PR was merged into the master branch.

Discussion
----------

Fix JSON parse error in Twig docs

Commits
-------

a7efc8f4 Fix JSON parse error in Twig docs
parents 93259933 a7efc8f4
...@@ -60,7 +60,7 @@ some Symfony2 components and Twig. Add it as a dependency to your ...@@ -60,7 +60,7 @@ some Symfony2 components and Twig. Add it as a dependency to your
.. code-block:: json .. code-block:: json
"require": { "require": {
"symfony/twig-bridge": "~2.1", "symfony/twig-bridge": "~2.1"
} }
When present, the ``TwigServiceProvider`` will provide you with the following When present, the ``TwigServiceProvider`` will provide you with the following
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment