diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-03-05 19:58:22 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-03-05 19:58:22 +0200 |
commit | 7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f (patch) | |
tree | 5715424ab1454463a3f8ca458729347bbc014f5b /client/components/users/userHeader.js | |
parent | 7b68f1901e8bd81ec8fbebb60a3f4e057b57d06d (diff) | |
parent | 39f2837838ba30ec02bfe9f33c9fa0dfca05d1a6 (diff) | |
download | wekan-7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f.tar.gz wekan-7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f.tar.bz2 wekan-7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f.zip |
Fix merge conflict.
Diffstat (limited to 'client/components/users/userHeader.js')
-rw-r--r-- | client/components/users/userHeader.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js index 98053ed1..73a11fc0 100644 --- a/client/components/users/userHeader.js +++ b/client/components/users/userHeader.js @@ -15,6 +15,9 @@ Template.memberMenuPopup.events({ AccountsTemplates.logout(); }, + 'click .js-go-setting'() { + Popup.close(); + }, }); Template.editProfilePopup.events({ |