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

2016-08-28 16:15:27 +02:00
parent 13d44ca766 985f5f9d05
commit cdd3010b47
13 changed files with 192 additions and 6 deletions
--- a/docs/en/user/errors_during_fetching.rst
+++ b/docs/en/user/errors_during_fetching.rst
@ -12,7 +12,7 @@ There may be several reasons:
 How can I help to fix that?
 ---------------------------

- `by sending us an email with the article's URL <mailto:hello\@wallabag.org>`_
+- `by sending us an email with the article's URL <mailto:hello@wallabag.org>`_
 - by trying to fix this article by yourself :) by creating a file for the article.
  You can use `this tool <http://siteconfig.fivefilters.org/>`__.