Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts: src/cli/helpers/abe-sql.js
abecms · Oct 3, 2016 · 6a3b035 · 6a3b035
1 parent 50f0a8c
commit 6a3b035
Show file tree

Hide file tree

Showing 254 changed files with 562 additions and 24,457 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,4 +22,4 @@ coverage/*
 test/templates/hbs/*
 
 # dist
-#dist
+dist
diff --git a/.npmignore b/.npmignore
@@ -1,3 +1,5 @@
 src/
 test/
-.travis.yml
+.travis.yml
+.eslintrc.json
+.eslintignore
diff --git a/dist/cli/Builder.js b/dist/cli/Builder.js
diff --git a/dist/cli/Create.js b/dist/cli/Create.js
diff --git a/dist/cli/config/abe-config-local.js b/dist/cli/config/abe-config-local.js
diff --git a/dist/cli/config/abe-config.js b/dist/cli/config/abe-config.js
diff --git a/dist/cli/config/index.js b/dist/cli/config/index.js
diff --git a/dist/cli/controllers/Builder.js b/dist/cli/controllers/Builder.js