Merge branch 'master' into 1220-cra-kitchensink-reboot

storybookjs · Jun 15, 2017 · aaa6e5b · aaa6e5b
2 parents 3cb388c + f64f5b7
commit aaa6e5b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+# 3.1.4
+
+2017-June-15
+
+#### Features
+
+-   IMPROVE design of addon-events [#1249](https://github.com/storybooks/storybook/pull/1249)
+-   Add a `shallowSnapshot` option for storyshots `test` functions [#1232](https://github.com/storybooks/storybook/pull/1232)
+
+#### Bug Fixes
+
+-   Fix app entry bug in RN gestorybook [#1280](https://github.com/storybooks/storybook/pull/1280)
+-   fix(addons/info): Cannot read property 'props' of undefined [#1258](https://github.com/storybooks/storybook/pull/1258)
+
+#### Documentation
+
+-   Add versions plugin to docs [#1269](https://github.com/storybooks/storybook/pull/1269)
+
 # 3.1.3
 
 2017-June-10

diff --git a/addons/events/package.json b/addons/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "3.1.1",
+  "version": "3.1.4",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",

diff --git a/addons/info/package.json b/addons/info/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-info",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "description": "A Storybook addon to show additional information for your stories.",
   "license": "MIT",
   "main": "dist/index.js",

diff --git a/addons/storyshots/package.json b/addons/storyshots/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storyshots",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.",
   "license": "MIT",
   "main": "dist/index.js",

diff --git a/lerna.json b/lerna.json
@@ -22,5 +22,5 @@
     "examples/*"
   ],
   "concurrency": 1,
-  "version": "3.1.3"
+  "version": "3.1.4"
 }
diff --git a/lib/cli/package.json b/lib/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/cli",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "description": "Storybook's CLI - easiest method of adding storybook to your projects",
   "keywords": [
     "cli",