aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-01-20 10:22:44 +0100
committerMorris Jobke <hey@morrisjobke.de>2016-01-20 10:23:57 +0100
commitc2a1a02fe452fe93057f36e6d37a8634df2e0bd6 (patch)
treeb3714b1b14f22a581e214e782bbc4850d2a14399 /core
parent06fe4cabfc55a8ba4df954c871e6cff2fbbd67d2 (diff)
downloadnextcloud-server-c2a1a02fe452fe93057f36e6d37a8634df2e0bd6.tar.gz
nextcloud-server-c2a1a02fe452fe93057f36e6d37a8634df2e0bd6.zip
move user controller to core/controller
Diffstat (limited to 'core')
-rw-r--r--core/application.php2
-rw-r--r--core/controller/usercontroller.php (renamed from core/user/usercontroller.php)2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/application.php b/core/application.php
index 996a612105d..6536f63c1d8 100644
--- a/core/application.php
+++ b/core/application.php
@@ -30,7 +30,7 @@ use OC\AppFramework\Utility\SimpleContainer;
use OC\AppFramework\Utility\TimeFactory;
use \OCP\AppFramework\App;
use OC\Core\LostPassword\Controller\LostController;
-use OC\Core\User\UserController;
+use OC\Core\Controller\UserController;
use OC\Core\Controller\AvatarController;
use \OCP\Util;
diff --git a/core/user/usercontroller.php b/core/controller/usercontroller.php
index 38ecd86b459..72193761022 100644
--- a/core/user/usercontroller.php
+++ b/core/controller/usercontroller.php
@@ -20,7 +20,7 @@
*
*/
-namespace OC\Core\User;
+namespace OC\Core\Controller;
use \OCP\AppFramework\Controller;
use \OCP\AppFramework\Http\JSONResponse;