diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-11-03 14:55:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-03 14:55:24 +0100 |
| commit | 816c0940d142f8ec69bdd3f302c9751033cce7e2 (patch) | |
| tree | 27390401e4c6cbd56295ba913c2597f3618ad962 /src/Wallabag/CoreBundle/Controller/ConfigController.php | |
| parent | 5feef9f7a4e6852415feb388190b7ca141f116d1 (diff) | |
| parent | 32508ef07aeb43966694ae360eeaeff8325e2a4d (diff) | |
| download | wallabag-816c0940d142f8ec69bdd3f302c9751033cce7e2.tar.gz wallabag-816c0940d142f8ec69bdd3f302c9751033cce7e2.tar.zst wallabag-816c0940d142f8ec69bdd3f302c9751033cce7e2.zip | |
Merge pull request #2523 from wallabag/qrcode-android-app
Added QRCode and link to configure android application
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/ConfigController.php')
| -rw-r--r-- | src/Wallabag/CoreBundle/Controller/ConfigController.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 8d391917..d40efcd7 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
| @@ -149,6 +149,7 @@ class ConfigController extends Controller | |||
| 149 | 'token' => $config->getRssToken(), | 149 | 'token' => $config->getRssToken(), |
| 150 | ], | 150 | ], |
| 151 | 'twofactor_auth' => $this->getParameter('twofactor_auth'), | 151 | 'twofactor_auth' => $this->getParameter('twofactor_auth'), |
| 152 | 'wallabag_url' => $this->get('craue_config')->get('wallabag_url'), | ||
| 152 | 'enabled_users' => $this->getDoctrine() | 153 | 'enabled_users' => $this->getDoctrine() |
| 153 | ->getRepository('WallabagUserBundle:User') | 154 | ->getRepository('WallabagUserBundle:User') |
| 154 | ->getSumEnabledUsers(), | 155 | ->getSumEnabledUsers(), |