Merge pull request #26 from bitshares/develop

Sync master with beet-js (breaking changes from PD3)
bitshares · Nov 5, 2018 · 7ce051b · 7ce051b
2 parents 9d3c997 + 7690a9f
commit 7ce051b
Show file tree

Hide file tree

Showing 37 changed files with 5,735 additions and 2,477 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,18 @@
+module.exports = {
+    "env": {
+        "node": true
+    },
+    extends: [        
+        "eslint:recommended",
+        'plugin:vue/recommended'
+    ],
+    rules: {
+        'vue/script-indent': ['warn', 4, {
+          'baseIndent': 1
+        }],
+        'vue/html-indent': ['warn', 4, {
+          'baseIndent': 1
+        }],        
+        "no-console": 0
+    }
+}