Merge remote-tracking branch 'origin/master'

Administrator

2023-08-18 fc45913412a310d2855dcd80dfc560acf965559d

1
2
3
4
5
var convert = require('./convert'),
    func = convert('mergeAll', require('../merge'));
 
func.placeholder = require('./placeholder');
module.exports = func;