diff options
author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-28 09:57:24 +0100 |
---|---|---|
committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-28 09:57:24 +0100 |
commit | 1d44a99ebb5f00b3b9550f4c281db7519cec3c75 (patch) | |
tree | 43a6ab3a67421bbf6589f757a97088eb16dff08b /core/js/update.js | |
parent | dbc13cf6ee775745c86f92d97d636f9ed3cf5432 (diff) | |
parent | 31d83fddc482959d7fb4f7377cc7020c59c30951 (diff) | |
download | nextcloud-server-1d44a99ebb5f00b3b9550f4c281db7519cec3c75.tar.gz nextcloud-server-1d44a99ebb5f00b3b9550f4c281db7519cec3c75.zip |
Merge branch 'master' into updater-CSP
Conflicts:
core/templates/update.php
Diffstat (limited to 'core/js/update.js')
-rw-r--r-- | core/js/update.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/js/update.js b/core/js/update.js index c10aa013e6a..8ab02bbf935 100644 --- a/core/js/update.js +++ b/core/js/update.js @@ -1,5 +1,4 @@ $(document).ready(function () { - OC.EventSource.requesttoken = oc_requesttoken; var updateEventSource = new OC.EventSource(OC.webroot+'/core/ajax/update.php'); updateEventSource.listen('success', function(message) { $('<span>').append(message).append('<br />').appendTo($('.update')); |