diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-09 11:38:22 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-09 11:38:22 -0400 |
| commit | 78cd1153f012f871935130325167759898f030ab (patch) | |
| tree | 685a5fe56663e6b6087aa4f28c8f09daf1e80546 /apps/media | |
| parent | b830b3e24b281204344e9162352c7034f0a67187 (diff) | |
| parent | f9cec1426fe639a5683e36b5fbdeb9149feacb19 (diff) | |
| download | nextcloud-server-78cd1153f012f871935130325167759898f030ab.tar.gz nextcloud-server-78cd1153f012f871935130325167759898f030ab.zip | |
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/vcard.php
apps/files_sharing/sharedstorage.php
Diffstat (limited to 'apps/media')
| -rw-r--r-- | apps/media/ajax/autoupdate.php | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/apps/media/ajax/autoupdate.php b/apps/media/ajax/autoupdate.php index c2dbf27a004..a5801f1a0e0 100644 --- a/apps/media/ajax/autoupdate.php +++ b/apps/media/ajax/autoupdate.php @@ -23,11 +23,6 @@ header('Content-type: text/html; charset=UTF-8') ; -//no apps or filesystem -$RUNTIME_NOAPPS=true; -$RUNTIME_NOSETUPFS=true; - - OCP\JSON::checkAppEnabled('media'); $autoUpdate=(isset($_GET['autoupdate']) and $_GET['autoupdate']=='true'); |