李玉春 2e8baf8959 Merge branch 'sprint/168_dingna_merge' into 'sprint/168' ...

* Conflict resolution.

See merge request easycorp/zentaopms!235

2021-10-29 06:16:03 +00:00

..

css

Merge branch 'sprint/168' into 'sprint/168_dingna_task_43401'

2021-10-29 05:50:12 +00:00

js

Merge branch 'sprint/168_xiawenlong' into 'sprint/168'

2021-10-29 06:15:26 +00:00

lang

* Add button of set WIP and column name.

2021-10-28 16:19:16 +08:00

view

* Conflict resolution.

2021-10-29 14:12:07 +08:00

config.php

* Finish task #41555.

2021-08-18 15:10:18 +08:00

control.php

* Conflict resolution.

2021-10-29 14:12:07 +08:00

model.php

* Add comment of kanban model.php

2021-10-26 10:49:42 +08:00