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 /.eslintrc.json | |
| parent | 7b68f1901e8bd81ec8fbebb60a3f4e057b57d06d (diff) | |
| parent | 39f2837838ba30ec02bfe9f33c9fa0dfca05d1a6 (diff) | |
| download | wekan-7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f.tar.gz wekan-7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f.tar.bz2 wekan-7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f.zip | |
Fix merge conflict.
Diffstat (limited to '.eslintrc.json')
| -rw-r--r-- | .eslintrc.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.eslintrc.json b/.eslintrc.json index 4808d873..0caa7a01 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -119,6 +119,8 @@ "allowIsBoardMember": true, "allowIsBoardMemberByCard": true, "Emoji": true, - "Checklists": true + "Checklists": true, + "Settings": true, + "InvitationCodes": true } } |