Merge branch 'QA_4_5'

This commit is contained in:
Marc Delisle 2015-09-23 08:37:47 -04:00
commit 34d3657fbd

View File

@ -20,8 +20,8 @@ PHP
* You need GD2 support in PHP to display inline thumbnails of JPEGs
("image/jpeg: inline") with their original aspect ratio.
* When using the cookie authentication (the default), the `mcrypt
<http://www.php.net/mcrypt>`_ extension is strongly suggested.
* When using the cookie authentication (the default), the `openssl
<http://www.php.net/openssl>`_ extension is strongly suggested.
* To support upload progress bars, see :ref:`faq2_9`.