aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Controller/ConfigController.php
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2015-06-01 15:49:49 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2015-06-01 15:49:49 +0200
commit2878416f8b4d94fb5e64c2fa61861526a7654d3d (patch)
treecbdf2d95ecdb651e2003747a28572c35b6c9da64 /src/Wallabag/CoreBundle/Controller/ConfigController.php
parent98510a4189186c8dcc3f1bf38843d935ed3d1859 (diff)
parent4346a86068781f4acdeb574d7e2af08b77b58ea7 (diff)
downloadwallabag-2878416f8b4d94fb5e64c2fa61861526a7654d3d.tar.gz
wallabag-2878416f8b4d94fb5e64c2fa61861526a7654d3d.tar.zst
wallabag-2878416f8b4d94fb5e64c2fa61861526a7654d3d.zip
Merge pull request #1167 from wallabag/v2-api-bundle
Move API stuff in ApiBundle
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/ConfigController.php')
-rw-r--r--src/Wallabag/CoreBundle/Controller/ConfigController.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 898c291f..62ef3eea 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -133,7 +133,7 @@ class ConfigController extends Controller
133 'rss' => array( 133 'rss' => array(
134 'username' => $user->getUsername(), 134 'username' => $user->getUsername(),
135 'token' => $config->getRssToken(), 135 'token' => $config->getRssToken(),
136 ) 136 ),
137 )); 137 ));
138 } 138 }
139 139