合并冲突

shuishen

2021-06-03 cd411e7b3ade23951e8935924252f7059cc096d5

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