Merge branch 'master' of https://github.com/storybooks/storybook into… · storybookjs/storybook@2be6ff2 · GitHub

Commit

Merge branch 'master' of https://github.com/storybooks/storybook into (…

Browse files

…#1736)-Ability-to-force-redender-a-story

# Conflicts:
#	app/react/src/client/preview/render.js

Loading branch information

dangreenisrael committed Dec 28, 2017

2 parents 293bb7a + 8e1caac commit 2be6ff2