Merge pull request #2401 from wallabag/reset-account

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

Mon, 24 Oct 2016 09:57:51 +0000 (11:57 +0200)

committer GitHub <noreply@github.com>

Mon, 24 Oct 2016 09:57:51 +0000 (11:57 +0200)
author Jeremy Benoist <j0k3r@users.noreply.github.com>
Mon, 24 Oct 2016 09:57:51 +0000 (11:57 +0200)
committer GitHub <noreply@github.com>
Mon, 24 Oct 2016 09:57:51 +0000 (11:57 +0200)
diff --cc src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php
Simple merge
author	Jeremy Benoist <j0k3r@users.noreply.github.com>
	Mon, 24 Oct 2016 09:57:51 +0000 (11:57 +0200)
committer	GitHub <noreply@github.com>
	Mon, 24 Oct 2016 09:57:51 +0000 (11:57 +0200)