王怡栋 5f15025297 Merge branch 'master' into '15.0.beta1' ...

# Conflicts:
#   module/upgrade/control.php

2021-06-18 02:19:40 +00:00

..

css

…

js

…

lang

* Revert the changed code of task #38644.

2021-06-05 18:14:44 +08:00

view

Merge branch 'master' into '15.0.beta1'

2021-06-18 02:19:40 +00:00

config.php

…

control.php

* Modify custom setting verify.

2021-06-11 13:52:02 +08:00

model.php

…