mirror of
https://github.com/wekan/wekan.git
synced 2026-03-03 12:20:15 +01:00
Resolve merge conflicts by accepting PR #6131 changes
Co-authored-by: xet7 <15545+xet7@users.noreply.github.com>
This commit is contained in:
parent
dc0b68ee80
commit
97dd5d2064
257 changed files with 9483 additions and 14103 deletions
|
|
@ -85,4 +85,5 @@ template(name="setCardActionsColorPopup")
|
|||
span.card-label.palette-color.js-palette-color(class="card-details-{{color}}")
|
||||
if(isSelected color)
|
||||
i.fa.fa-check
|
||||
button.primary.confirm.js-submit {{_ 'save'}}
|
||||
.form-buttons
|
||||
button.primary.confirm.js-submit {{_ 'save'}}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue