Merge remote-tracking branch 'origin/master'

nnnjjj123

2020-11-06 cc3cc145a8cc38dcb2fc123b671fac0c39450a33

1
2
//>>built
define({setButtonText:"Defin\u00e9r",cancelButtonText:"Annull\u00e9r"});