Merge branch '4.0-dev' into install_from_web_40

brianteeman · Jan 18, 2018 · 56ce708 · 56ce708
2 parents ec441a5 + 122281a
commit 56ce708
Show file tree

Hide file tree

Showing 619 changed files with 17,228 additions and 23,258 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,10 @@
+{
+	"extends": "airbnb-base",
+	"parser": "babel-eslint",
+	"env": {
+		"browser": true
+	},
+	"rules": {
+		"class-methods-use-this": "off"
+	}
+}
diff --git a/Gruntfile.js b/Gruntfile.js