]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #1157 owncloud/move-OpenID
authorBart Visscher <bartv@thisnet.nl>
Fri, 11 Jan 2013 21:57:40 +0000 (22:57 +0100)
committerBart Visscher <bartv@thisnet.nl>
Fri, 11 Jan 2013 21:57:40 +0000 (22:57 +0100)
Move openid.php to apps repo

Conflicts:
settings/routes.php

1  2 
settings/routes.php

index 595b83c313e689cba615cb85ecc94ad3d5fa3c27,60e01527105038558d4dfaa6d5fc6a8424912b59..9b5bf809230cc74b0aa6248d1f76524f05c92558
@@@ -57,10 -57,4 +57,6 @@@ $this->create('settings_ajax_navigation
  $this->create('settings_ajax_getlog', '/settings/ajax/getlog.php')
        ->actionInclude('settings/ajax/getlog.php');
  $this->create('settings_ajax_setloglevel', '/settings/ajax/setloglevel.php')
 -      ->actionInclude('settings/ajax/setloglevel.php');
 +      ->actionInclude('settings/ajax/setloglevel.php');
 +$this->create('settings_ajax_setsecurity', '/settings/ajax/setsecurity.php')
 +      ->actionInclude('settings/ajax/setsecurity.php');
- // apps/user_openid
- $this->create('settings_ajax_openid', '/settings/ajax/openid.php')
-       ->actionInclude('settings/ajax/openid.php');