Merge branch 'master' into 1174

enzymejs · Sep 29, 2017 · 2e01457 · 2e01457
2 parents 8d79752 + 65550bc
commit 2e01457
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,8 @@ node_modules
 _book
 
 # Only apps should have lockfiles
+npm-shrinkwrap.json
 package-lock.json
+yarn.lock
 
 packages/*/build/