mirror of
https://github.com/wekan/wekan.git
synced 2026-03-11 16:12:34 +01:00
resolving merge conflicts
This commit is contained in:
commit
9518a5c11e
30 changed files with 880 additions and 58 deletions
|
|
@ -113,6 +113,7 @@ template(name="boardHeaderBar")
|
|||
|
||||
template(name="boardMenuPopup")
|
||||
ul.pop-over-list
|
||||
li: a.js-custom-fields {{_ 'custom-fields'}}
|
||||
li: a.js-open-archives {{_ 'archived-items'}}
|
||||
if currentUser.isBoardAdmin
|
||||
li: a.js-change-board-color {{_ 'board-change-color'}}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue