Merge branch 'examples-regressiontesting' of github.com:storybooks/mo…

…no into add-examples # Conflicts: # .gitignore # packages/addon-knobs/yarn.lock
storybookjs · Apr 15, 2017 · 7eef6b8 · 7eef6b8
2 parents dedc238 + 30f28ba
commit 7eef6b8
Show file tree

Hide file tree

Showing 25 changed files with 2,672 additions and 24,020 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@ dist
 *.DS_Store
 *.lerna_backup
 build
+packages/examples/automated-*
 yarn.lock
diff --git a/lerna.json b/lerna.json
@@ -1,7 +1,8 @@
 {
   "lerna": "2.0.0-beta.38",
+  "version": "3.0.0",
   "packages": [
-    "packages/*"
-  ],
-  "version": "0.0.0"
+    "packages/*",
+    "packages/examples/*"
+  ]
 }