mirror of
https://github.com/storybookjs/storybook.git
synced 2025-04-06 00:31:05 +08:00
f9abc6a986
# Conflicts: # addons/events/src/deprecated.js # addons/options/src/register.ts # examples/official-storybook/stories/core/decorators.stories.js # examples/official-storybook/stories/deprecated/addon-events.stories.js # lib/addons/src/make-decorator.test.ts # lib/api/src/modules/layout.ts # lib/cli/src/generate.js # lib/core/package.json