Merge branch 'master' into develop

This commit is contained in:
Michael Teeuw 2016-12-31 21:16:09 +01:00 committed by GitHub
commit 09e6a6a4ad
2 changed files with 2 additions and 0 deletions

View file

@ -43,6 +43,7 @@
var ret = fn.apply(this, arguments);
this._super = tmp;
return ret;
};
})(name, prop[name]) : prop[name];