diff options
author | Georg Ehrke <developer@georgehrke.com> | 2013-08-19 11:24:17 +0200 |
---|---|---|
committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-19 11:24:17 +0200 |
commit | f2702ff1ca45d72300eed5dfa58ebc19aa6e9910 (patch) | |
tree | b1424be17877cbd25bf3781600d353efd3dd0759 /core/routes.php | |
parent | 7e4dcd268f6cb6618600718a51c4d882e9027829 (diff) | |
parent | 9be836814cb4165ea54a086a0f97526d783bcd37 (diff) | |
download | nextcloud-server-f2702ff1ca45d72300eed5dfa58ebc19aa6e9910.tar.gz nextcloud-server-f2702ff1ca45d72300eed5dfa58ebc19aa6e9910.zip |
Merge master into oc_preview
Diffstat (limited to 'core/routes.php')
-rw-r--r-- | core/routes.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/routes.php b/core/routes.php index 75cc4d511c0..ce35be1d583 100644 --- a/core/routes.php +++ b/core/routes.php @@ -78,4 +78,4 @@ $this->create('app_script', '/apps/{app}/{file}') // used for heartbeat $this->create('heartbeat', '/heartbeat')->action(function(){ // do nothing -});
\ No newline at end of file +}); |