diff options
author | Thomas Tanghus <thomas@tanghus.net> | 2012-11-05 12:06:59 +0100 |
---|---|---|
committer | Thomas Tanghus <thomas@tanghus.net> | 2012-11-05 12:06:59 +0100 |
commit | 1147dc977422e827a201fa081abd07721231d072 (patch) | |
tree | 203d47297c49545a67bbdd98cbe137b255a5d6d8 /core/routes.php | |
parent | 88b91a7304f2de998f71a674f4f62e85f5b83e54 (diff) | |
parent | 135680e50bf760d55a1bcaaaa02f959bde396c52 (diff) | |
download | nextcloud-server-1147dc977422e827a201fa081abd07721231d072.tar.gz nextcloud-server-1147dc977422e827a201fa081abd07721231d072.zip |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
Diffstat (limited to 'core/routes.php')
-rw-r--r-- | core/routes.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/core/routes.php b/core/routes.php index 3ac943f7c6c..fc511d403d8 100644 --- a/core/routes.php +++ b/core/routes.php @@ -13,9 +13,6 @@ $this->create('search_ajax_search', '/search/ajax/search.php') // AppConfig $this->create('core_ajax_appconfig', '/core/ajax/appconfig.php') ->actionInclude('core/ajax/appconfig.php'); -// RequestToken -$this->create('core_ajax_requesttoken', '/core/ajax/requesttoken.php') - ->actionInclude('core/ajax/requesttoken.php'); // Share $this->create('core_ajax_share', '/core/ajax/share.php') ->actionInclude('core/ajax/share.php'); |