diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-12-29 20:45:58 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-12-29 20:45:58 -0200 |
| commit | 97e689213ff4e829f251af526ed4e796a3cc2b71 (patch) | |
| tree | b04d03ec56305041216b72328fc9b5afde27bc76 /mod/lightpics/vendors/jquery-file-upload/cors/result.html | |
| parent | 0ab6351abb7a602d96c62b0ad35413c88113a6cf (diff) | |
| parent | 69e2d8c5d8732042c9319aef1fdea45a82b63e42 (diff) | |
| download | elgg-97e689213ff4e829f251af526ed4e796a3cc2b71.tar.gz elgg-97e689213ff4e829f251af526ed4e796a3cc2b71.tar.bz2 | |
Merge branch 'master' into saravea
Conflicts:
.gitmodules
mod/admins
mod/assemblies
mod/audio_html5
mod/beechat
mod/crud
mod/elgg-activitystreams
mod/elggman
mod/elggpg
mod/favorites
mod/federated-objects
mod/friendly_time
mod/group_alias
mod/group_operators
mod/languages
mod/lightpics
mod/openid_client
mod/spotlight
mod/suicide
mod/tasks
mod/videolist
Diffstat (limited to 'mod/lightpics/vendors/jquery-file-upload/cors/result.html')
| -rw-r--r-- | mod/lightpics/vendors/jquery-file-upload/cors/result.html | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/mod/lightpics/vendors/jquery-file-upload/cors/result.html b/mod/lightpics/vendors/jquery-file-upload/cors/result.html new file mode 100644 index 000000000..7c9802684 --- /dev/null +++ b/mod/lightpics/vendors/jquery-file-upload/cors/result.html @@ -0,0 +1,20 @@ +<!DOCTYPE HTML> +<!-- +/* + * jQuery Iframe Transport Plugin Redirect Page 2.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2010, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ +--> +<html lang="en"> +<head> +<meta charset="utf-8"> +<title>jQuery Iframe Transport Plugin Redirect Page</title> +</head> +<body><script>document.body.innerHTML=decodeURIComponent(window.location.search.slice(1));</script></body> +</html>
\ No newline at end of file |