aboutsummaryrefslogtreecommitdiffstats
path: root/core/js/oc-requesttoken.js
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-08-22 17:59:39 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2013-08-22 17:59:39 +0200
commit9e1016f7d2aa7c23fc6287a563e6551809edcbe8 (patch)
tree2ec3b29c78b88581aa12df4bee3262fee939907d /core/js/oc-requesttoken.js
parentfed1792510ff11941765783653573f45fadc4c70 (diff)
parent02b2b5a808b135007d8d54b837e70c38f02729fd (diff)
downloadnextcloud-server-9e1016f7d2aa7c23fc6287a563e6551809edcbe8.tar.gz
nextcloud-server-9e1016f7d2aa7c23fc6287a563e6551809edcbe8.zip
Merge branch 'master' into fixing-4343-master
Conflicts: lib/connector/sabre/quotaplugin.php
Diffstat (limited to 'core/js/oc-requesttoken.js')
-rw-r--r--core/js/oc-requesttoken.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/js/oc-requesttoken.js b/core/js/oc-requesttoken.js
index f4cf286b8aa..6cc6b5a855b 100644
--- a/core/js/oc-requesttoken.js
+++ b/core/js/oc-requesttoken.js
@@ -1,3 +1,3 @@
$(document).bind('ajaxSend', function(elm, xhr, s) {
xhr.setRequestHeader('requesttoken', oc_requesttoken);
-}); \ No newline at end of file
+});