Skip to content

Commit a6195d2

Browse files
committed
Merge branch 'develop'
2 parents 7cbdea9 + 6a50204 commit a6195d2

File tree

157 files changed

+14260
-5023
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+14260
-5023
lines changed

.eslintrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
"sourceType": "module",
1010
"ecmaVersion": 2017
1111
},
12+
"globals": {
13+
"__": true
14+
},
1215
"rules": {
1316
"accessor-pairs": "error",
1417
"array-bracket-newline": "error",

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: node_js
22
node_js:
3-
- "7"
3+
- "8"
44
addons:
55
code_climate:
66
repo_token: 7454b1a666015e244c384d19f48c34e35d1ae58c3aa428ec542f10bbcb848358

0 commit comments

Comments
 (0)