fix broken merge

remotes/origin/stable
Robin Appelman 14 years ago
parent 0dad1f8ccb
commit 556bf2ef4d
  1. 2
      core/js/js.js

@ -73,6 +73,8 @@ if (!Array.prototype.filter) {
}
}
return res;
}
}
if (!Array.prototype.indexOf){
Array.prototype.indexOf = function(elt /*, from*/)
{

Loading…
Cancel
Save