Merge remote-tracking branch 'origin/master' into 2.2

This commit is contained in:
Jeremy Benoist
2016-11-03 16:41:29 +01:00
60 changed files with 2477 additions and 1936 deletions

View File

@ -46,3 +46,10 @@ I forgot my password
You can reset your password by clicking on ``Forgot your password?`` link,
on the login page. Then, fill the form with your email address or your username,
you'll receive an email to reset your password.
I've got the ``failed to load external entity`` error when I try to install wallabag
------------------------------------------------------------------------------------
As described `here <https://github.com/wallabag/wallabag/issues/2529>`_, please edit your ``web/app.php`` file and add this line: ``libxml_disable_entity_loader(false);`` on line 5.
This is a Doctrine / PHP bug, nothing we can do about it.