diff options
| author | IgnatzHome <ignatz@maschath.de> | 2018-05-17 20:21:07 +0200 |
|---|---|---|
| committer | IgnatzHome <ignatz@maschath.de> | 2018-05-17 20:21:07 +0200 |
| commit | 9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874 (patch) | |
| tree | 47ffe9a487aa6d66bbb4cd327ca248c4b30fda4a /client/components/boards/boardHeader.jade | |
| parent | c0c7b269a794fb28ddf5ffc17744f6724041de96 (diff) | |
| parent | 8b16955cc27b29ae507be084adccc4fad61b05ef (diff) | |
| download | wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.gz wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.bz2 wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.zip | |
resolving merge conflicts
Diffstat (limited to 'client/components/boards/boardHeader.jade')
| -rw-r--r-- | client/components/boards/boardHeader.jade | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index fe0771cb..b4ccd3b3 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -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'}} |