diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-11 21:01:30 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-11 21:01:30 +0200 |
| commit | e4cf672ccf61689ba28c2e89fc55f83167800b18 (patch) | |
| tree | 5dc22c97797bdcdd0a3d2a7e182410f04a748c1e /src/Wallabag/ApiBundle/Entity/AccessToken.php | |
| parent | e57df5611fe82ce61a71d51c762ee9296f18c3ac (diff) | |
| parent | dbe94e73a9eaf3acb250812913b0303b35d01a2e (diff) | |
| download | wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.tar.gz wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.tar.zst wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'src/Wallabag/ApiBundle/Entity/AccessToken.php')
| -rw-r--r-- | src/Wallabag/ApiBundle/Entity/AccessToken.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Wallabag/ApiBundle/Entity/AccessToken.php b/src/Wallabag/ApiBundle/Entity/AccessToken.php index 2ff63a83..c09a0c80 100644 --- a/src/Wallabag/ApiBundle/Entity/AccessToken.php +++ b/src/Wallabag/ApiBundle/Entity/AccessToken.php | |||
| @@ -19,7 +19,7 @@ class AccessToken extends BaseAccessToken | |||
| 19 | protected $id; | 19 | protected $id; |
| 20 | 20 | ||
| 21 | /** | 21 | /** |
| 22 | * @ORM\ManyToOne(targetEntity="Client") | 22 | * @ORM\ManyToOne(targetEntity="Client", inversedBy="accessTokens") |
| 23 | * @ORM\JoinColumn(nullable=false) | 23 | * @ORM\JoinColumn(nullable=false) |
| 24 | */ | 24 | */ |
| 25 | protected $client; | 25 | protected $client; |