Merge pull request #1710 from wallabag/v2-message-graby-fails

author Jeremy Benoist <j0k3r@users.noreply.github.com>

Wed, 24 Feb 2016 07:43:17 +0000 (08:43 +0100)

committer Jeremy Benoist <j0k3r@users.noreply.github.com>

Wed, 24 Feb 2016 07:43:17 +0000 (08:43 +0100)
author Jeremy Benoist <j0k3r@users.noreply.github.com>
Wed, 24 Feb 2016 07:43:17 +0000 (08:43 +0100)
committer Jeremy Benoist <j0k3r@users.noreply.github.com>
Wed, 24 Feb 2016 07:43:17 +0000 (08:43 +0100)
diff --cc docs/en/index.rst
Simple merge
diff --cc docs/fr/index.rst
Simple merge
author	Jeremy Benoist <j0k3r@users.noreply.github.com>
	Wed, 24 Feb 2016 07:43:17 +0000 (08:43 +0100)
committer	Jeremy Benoist <j0k3r@users.noreply.github.com>
	Wed, 24 Feb 2016 07:43:17 +0000 (08:43 +0100)
		1	2
docs/en/index.rst	patch \|	diff1 \|	diff2 \|	blob \| history
docs/fr/index.rst	patch \|	diff1 \|	diff2 \|	blob \| history