diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-12-31 14:34:28 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-12-31 14:34:28 +0100 |
| commit | 988710b0fc4e77b1a565a9f3ee4e7f24a539e057 (patch) | |
| tree | c8ea8d0f9ac2cdcf828cd3a0f443f0ec2e79907d /core/routes.php | |
| parent | 760fa9ea3005e7df81a1fac54f207dbe7d8ef312 (diff) | |
| download | nextcloud-server-988710b0fc4e77b1a565a9f3ee4e7f24a539e057.tar.gz nextcloud-server-988710b0fc4e77b1a565a9f3ee4e7f24a539e057.zip | |
avoid conflict with physical file config.js
Diffstat (limited to 'core/routes.php')
| -rw-r--r-- | core/routes.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/routes.php b/core/routes.php index 5009243d59f..f8454877e03 100644 --- a/core/routes.php +++ b/core/routes.php @@ -7,6 +7,7 @@ */ // Post installation check +/** @var $this OC_Router */ $this->create('post_setup_check', '/post-setup-check') ->action('OC_Setup', 'postSetupCheck'); @@ -61,7 +62,7 @@ $this->create('core_tags_delete', '/tags/{type}/delete') ->action('OC\Core\Tags\Controller', 'deleteTags') ->requirements(array('type')); // oC JS config -$this->create('js_config', '/core/js/config.js') +$this->create('js_config', '/core/js/oc.js') ->actionInclude('core/js/config.php'); // Routing $this->create('core_ajax_routes', '/core/routes.json') |