diff options
| author | dollybean <herbalproducts.ist@gmail.com> | 2020-02-04 02:28:45 -0800 |
|---|---|---|
| committer | dollybean <herbalproducts.ist@gmail.com> | 2020-02-04 02:28:45 -0800 |
| commit | 0b00a8095ce34c753e5edac86d4b62e8aaa1b1e0 (patch) | |
| tree | 11307a99c48966d5695466d359b48f88c0c31b0d /client/components/main | |
| parent | 85d47c4ff2c625331540d7cbc7f499c41df6d3b8 (diff) | |
| download | wekan-0b00a8095ce34c753e5edac86d4b62e8aaa1b1e0.tar.gz wekan-0b00a8095ce34c753e5edac86d4b62e8aaa1b1e0.tar.bz2 wekan-0b00a8095ce34c753e5edac86d4b62e8aaa1b1e0.zip | |
Customize of some card's functions
Diffstat (limited to 'client/components/main')
| -rwxr-xr-x | client/components/main/editor.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/client/components/main/editor.js b/client/components/main/editor.js index 39c03aa9..6c5b72b7 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -120,6 +120,10 @@ Template.editor.onRendered(() => { autosize($textarea); $textarea.escapeableTextComplete(mentions); }; +<<<<<<< HEAD +======= + +>>>>>>> ac37e360b69b799c12f03e1c158cfc0367d26e55 if (Meteor.settings.public.RICHER_CARD_COMMENT_EDITOR !== false) { const isSmall = Utils.isMiniScreen(); const toolbar = isSmall |