summaryrefslogtreecommitdiffstats
path: root/.eslintrc.js
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2019-02-10 16:57:27 +0100
committerGitHub <noreply@github.com>2019-02-10 16:57:27 +0100
commit08775c3cba2d604d1ee936af21d3a1fa0c61e1f5 (patch)
tree6967ccebe6bc187f22d3dc38700ab56f28a392f7 /.eslintrc.js
parent4e2b5afd837133022c91fd84987e519e54eb9372 (diff)
parent55bb0ba43b5a4756e4590cbeb7ad636fa04b0533 (diff)
Merge branch 'master' into index-php-redirect
Diffstat (limited to '.eslintrc.js')
-rw-r--r--.eslintrc.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/.eslintrc.js b/.eslintrc.js
index 92eb57e6..998e3f23 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -7,9 +7,10 @@ module.exports = {
jest: true
},
globals: {
- t: true,
- n: true,
oc_config: true,
+ oca_contacts: true,
+ n: true,
+ t: true,
OC: true,
OCA: true,
Vue: true,