Merge branch 'master' into calendar_export

2012-06-17 16:41:44 +02:00 · 2012-06-17 16:41:44 +02:00 · 4b872d10fc
parent a8da950819 b064fc6968
commit 4b872d10fc
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