diff options
| author | Maxime Quandalle <maxime@quandalle.com> | 2015-10-31 10:27:20 +0100 |
|---|---|---|
| committer | Maxime Quandalle <maxime@quandalle.com> | 2015-10-31 12:49:58 +0100 |
| commit | 2b134ff7a986eb97f8ec360321be284a7a8ea11e (patch) | |
| tree | 0ff579909b402db5916b66ec7bc7469534881a15 /client/components/cards/labels.jade | |
| parent | 3507c6565bb16b5f45c6f269f7376902f8b1ff37 (diff) | |
| parent | 41b23f88aea0f421226f92b081cdb1b61c64bde4 (diff) | |
| download | wekan-2b134ff7a986eb97f8ec360321be284a7a8ea11e.tar.gz wekan-2b134ff7a986eb97f8ec360321be284a7a8ea11e.tar.bz2 wekan-2b134ff7a986eb97f8ec360321be284a7a8ea11e.zip | |
Merge branch 'devel' into minicard-editor
Conflicts:
client/components/lists/listBody.js
Diffstat (limited to 'client/components/cards/labels.jade')
| -rw-r--r-- | client/components/cards/labels.jade | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/components/cards/labels.jade b/client/components/cards/labels.jade index a868627c..31bd4d06 100644 --- a/client/components/cards/labels.jade +++ b/client/components/cards/labels.jade @@ -18,7 +18,7 @@ template(name="editLabelPopup") form.edit-label +formLabel button.primary.wide.left(type="submit") {{_ 'save'}} - span.right + button.js-delete-label.negate.wide.right {{_ 'delete'}} template(name="deleteLabelPopup") p {{_ "label-delete-pop"}} |