diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-08-22 23:03:16 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-08-22 23:03:16 +0200 |
| commit | 79efca1e6ff28362d4bd2713f68205294cdd07de (patch) | |
| tree | c20482071f97b5ba0f075d59a9a097b08b26b910 /src/Wallabag/CoreBundle/Controller/EntryController.php | |
| parent | 9c545fe028013b30417c1a932cd6b9027bff752d (diff) | |
| parent | 80bb0b73445092c4aa3e94f90cc5f8667fa123ba (diff) | |
| download | wallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.tar.gz wallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.tar.zst wallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.zip | |
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/EntryController.php')
| -rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 4eb314f7..ccdf9406 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
| @@ -357,7 +357,7 @@ class EntryController extends Controller | |||
| 357 | } | 357 | } |
| 358 | 358 | ||
| 359 | /** | 359 | /** |
| 360 | * Changes favorite status for an entry. | 360 | * Changes starred status for an entry. |
| 361 | * | 361 | * |
| 362 | * @param Request $request | 362 | * @param Request $request |
| 363 | * @param Entry $entry | 363 | * @param Entry $entry |