Merge branch 'master' into oc_error

2012-06-17 16:41:54 +02:00 · 2012-06-17 16:41:54 +02:00 · 1710086b67
parent 06c610c2ee b064fc6968
commit 1710086b67
1 changed files with 1 additions and 2 deletions
--- a/apps/user_migrate/appinfo/app.php
+++ b/apps/user_migrate/appinfo/app.php
@ -22,7 +22,6 @@
 */

 OCP\App::registerPersonal( 'user_migrate', 'settings' );
-OCP\App::registerAdmin( 'user_migrate', 'admin' );
 OCP\Util::addscript( 'user_migrate', 'export');

 // add settings page to navigation
@ -32,4 +31,4 @@ $entry = array(
 	'href' => OCP\Util::linkTo( "user_migrate", "admin.php" ),
 	'name' => 'Import'
 );
-?>
+?>