Merge pull request #2708 from jcharaoui/import-disablecontentupdate

author Jérémy Benoist <j0k3r@users.noreply.github.com>

Fri, 2 Jun 2017 09:26:37 +0000 (11:26 +0200)

committer GitHub <noreply@github.com>

Fri, 2 Jun 2017 09:26:37 +0000 (11:26 +0200)
author Jérémy Benoist <j0k3r@users.noreply.github.com>
Fri, 2 Jun 2017 09:26:37 +0000 (11:26 +0200)
committer GitHub <noreply@github.com>
Fri, 2 Jun 2017 09:26:37 +0000 (11:26 +0200)
diff --cc src/Wallabag/CoreBundle/Controller/EntryController.php
Simple merge
author	Jérémy Benoist <j0k3r@users.noreply.github.com>
	Fri, 2 Jun 2017 09:26:37 +0000 (11:26 +0200)
committer	GitHub <noreply@github.com>
	Fri, 2 Jun 2017 09:26:37 +0000 (11:26 +0200)