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/boards/boardHeader.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/boards/boardHeader.jade')
| -rw-r--r-- | client/components/boards/boardHeader.jade | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index ffc79143..cb86e9bb 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -107,6 +107,9 @@ template(name="createBoardPopup") | {{{_ 'board-private-info'}}} a.js-change-visibility {{_ 'change'}}. input.primary.wide(type="submit" value="{{_ 'create'}}") + span.quiet + | {{_ 'or'}} + a.js-import {{_ 'import-board'}} template(name="boardChangeTitlePopup") |