王怡栋 d9d331c38e Merge branch 'master' into 'sprint/wangyuting_workflow' ...

# Conflicts:
#   framework/control.class.php

2022-05-10 08:46:32 +00:00

..

css

Merge branch 'pailei2_mayue_bug#14184' into 'pailei2'

2022-03-18 03:29:31 +00:00

js

* Add testtask.

2022-04-09 15:58:16 +08:00

lang

* Fix bug #13255.

2022-04-24 15:50:21 +08:00

view

* Adjust buildin workflow menu.

2022-05-10 16:32:04 +08:00

config.php

*Edit lang.

2022-02-21 17:04:03 +08:00

control.php

* Fix bug #17994.

2022-04-13 10:36:39 +08:00

model.php

Merge branch 'master' into 'sprint/wangyuting_workflow'

2022-05-10 08:46:32 +00:00