aboutsummaryrefslogtreecommitdiffstats
path: root/addon/js_upload/file-uploader/tests/iframe-content-tests/application-json.php
diff options
context:
space:
mode:
authorOlivier Migeot <olivier@migeot.org>2011-10-04 11:45:57 +0200
committerOlivier Migeot <olivier@migeot.org>2011-10-04 11:45:57 +0200
commit273594af62c960b5a52da5ec1cf6d6bd450415ba (patch)
tree5f79914d28c343f7642ecb13b99f9e0e3f5090a7 /addon/js_upload/file-uploader/tests/iframe-content-tests/application-json.php
parent1548449586f17c0ef9bfab0ffb16f2a495fc6082 (diff)
parentdfd5cc57c2134067dc6229b8583b5e808f160004 (diff)
downloadvolse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.tar.gz
volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.tar.bz2
volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'addon/js_upload/file-uploader/tests/iframe-content-tests/application-json.php')
-rw-r--r--addon/js_upload/file-uploader/tests/iframe-content-tests/application-json.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/addon/js_upload/file-uploader/tests/iframe-content-tests/application-json.php b/addon/js_upload/file-uploader/tests/iframe-content-tests/application-json.php
deleted file mode 100644
index c1161256f..000000000
--- a/addon/js_upload/file-uploader/tests/iframe-content-tests/application-json.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php header('Content-type: application/json'); ?> \ No newline at end of file