Merge branch 'master' into v0.10.x

db-migrate · Aug 13, 2017 · ed9be93 · ed9be93
2 parents c824115 + b0837d5
commit ed9be93
Show file tree

Hide file tree

Showing 13 changed files with 530 additions and 323 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ database.json
 *.sublime-project
 *.sublime-workspace
 archive
+.db-migraterc
 
 # Vim swap files
 .*.sw[a-z]
diff --git a/.npmignore b/.npmignore
@@ -8,3 +8,4 @@ database.json
 *.sublime-project
 *.sublime-workspace
 archive
+.db-migraterc