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

src/Wallabag/CoreBundle/Controller/FeedController.php

@@ -112,6 +112,9 @@ class FeedController extends Controller
             $user
         );
 
+        $perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag_core.feed_limit');
+        $entries->setMaxPerPage($perPage);
+
         if (null === $entries) {
             throw $this->createNotFoundException('No entries found?');
         }