王怡栋 d9ee0bfbf7 Merge branch 'master' into 'sprint/170_package_bug' ...

# Conflicts:
#   module/mr/model.php

2021-11-25 00:32:52 +00:00

..

css

…

js

* Fix bug #16577.

2021-11-23 15:07:07 +08:00

lang

…

view

* Fix bug #16577.

2021-11-23 15:07:07 +08:00

config.php

…

control.php

* Modify function name.

2021-11-24 16:45:08 +08:00

model.php

* Modify function name.

2021-11-24 16:45:08 +08:00