mirror of
https://github.com/storybookjs/storybook.git
synced 2025-04-05 01:51:07 +08:00
# Conflicts: # examples/angular-cli/.storybook/config.ts # examples/angular-cli/package.json # examples/cra-ts-kitchen-sink/package.json # examples/marko-cli/package.json # examples/mithril-kitchen-sink/package.json # examples/polymer-cli/package.json # examples/preact-kitchen-sink/package.json # examples/riot-kitchen-sink/package.json # examples/svelte-kitchen-sink/package.json # examples/vue-kitchen-sink/.storybook/addons.js # examples/vue-kitchen-sink/package.json