diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-01-12 01:57:40 +0400 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-01-12 01:57:40 +0400 |
| commit | b6086759387f0d14b46fa2f169cc3919506fec41 (patch) | |
| tree | 61410cb1809321de943b5158fd3eb6675ace1963 /settings/routes.php | |
| parent | da4a50a7fc10de3db23ae24eb8dcdbc039ad9207 (diff) | |
| parent | e11b650d2e28725fe88e6da3975e66d585e59d5e (diff) | |
Merge pull request #1157 owncloud/move-OpenID
Move openid.php to apps repo
Conflicts:
settings/routes.php
Diffstat (limited to 'settings/routes.php')
| -rw-r--r-- | settings/routes.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/settings/routes.php b/settings/routes.php index 595b83c313e..9b5bf809230 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -60,7 +60,3 @@ $this->create('settings_ajax_setloglevel', '/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'); |