Merge master

2019-10-25 19:18:23 +08:00
parent b0c53f83b8 feee8652dd
commit ff4ae62146
3 changed files with 15 additions and 6 deletions
--- a/.eslintrc
+++ b/.eslintrc
@@ -2,6 +2,7 @@
  "extends": "airbnb-base",
  "rules": {
    "no-underscore-dangle": 0,
+    "linebreak-style": 0
    "global-require": 0
  },
  "env": {