Commit 2183542a authored by Fabien Potencier's avatar Fabien Potencier

Merge branch '1.3'

* 1.3:
  Minor typo in web_servers.rst
  bumped version to 1.3.3-DEV
  prepared the 1.3.2 release
  updated CHANGELOG
parents 24a1c520 647ccdf3
...@@ -24,11 +24,16 @@ Changelog ...@@ -24,11 +24,16 @@ Changelog
* ``monolog.exception.logger_filter`` option added to Monolog service provider * ``monolog.exception.logger_filter`` option added to Monolog service provider
* [BC BREAK] ``$app['request']`` service removed, use ``$app['request_stack']`` instead * [BC BREAK] ``$app['request']`` service removed, use ``$app['request_stack']`` instead
1.3.2 (2015-XX-XX) 1.3.3 (2015-XX-XX)
------------------ ------------------
* n/a * n/a
1.3.2 (2015-08-24)
------------------
* no changes
1.3.1 (2015-08-04) 1.3.1 (2015-08-04)
------------------ ------------------
......
...@@ -25,7 +25,7 @@ following ``.htaccess`` file: ...@@ -25,7 +25,7 @@ following ``.htaccess`` file:
relative from the webroot. relative from the webroot.
Alternatively, if you use Apache 2.2.16 or higher, you can use the Alternatively, if you use Apache 2.2.16 or higher, you can use the
`FallbackResource directive`_ so make your .htaccess even easier: `FallbackResource directive`_ to make your .htaccess even easier:
.. code-block:: apache .. code-block:: apache
......
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