diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-07-03 13:55:25 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-07-03 13:55:25 +0200 |
| commit | 44043ebe82a22470e2514d05efac324035ee809a (patch) | |
| tree | 5ea40b62ce665a8bab6a3e280a47f3be11838e27 /src/Wallabag/CoreBundle/Controller | |
| parent | 11f15430ffc67e30f084cffc8e909ace87ce19e1 (diff) | |
| parent | e586d65b64089fc1cc230a18c470aae3f45f91a6 (diff) | |
| download | wallabag-44043ebe82a22470e2514d05efac324035ee809a.tar.gz wallabag-44043ebe82a22470e2514d05efac324035ee809a.tar.zst wallabag-44043ebe82a22470e2514d05efac324035ee809a.zip | |
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
| -rw-r--r-- | src/Wallabag/CoreBundle/Controller/RssController.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php index e84044b1..848bb814 100644 --- a/src/Wallabag/CoreBundle/Controller/RssController.php +++ b/src/Wallabag/CoreBundle/Controller/RssController.php | |||
| @@ -12,7 +12,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; | |||
| 12 | use Symfony\Component\HttpFoundation\Request; | 12 | use Symfony\Component\HttpFoundation\Request; |
| 13 | use Symfony\Component\HttpFoundation\Response; | 13 | use Symfony\Component\HttpFoundation\Response; |
| 14 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; | 14 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
| 15 | use Wallabag\CoreBundle\Entity\Entry; | ||
| 16 | use Wallabag\CoreBundle\Entity\Tag; | 15 | use Wallabag\CoreBundle\Entity\Tag; |
| 17 | use Wallabag\UserBundle\Entity\User; | 16 | use Wallabag\UserBundle\Entity\User; |
| 18 | 17 | ||