mirror of
https://github.com/storybookjs/storybook.git
synced 2025-04-06 01:01:06 +08:00
# Conflicts: # addons/docs/package.json # addons/essentials/package.json # addons/graphql/package.json # addons/knobs/package.json # addons/storyshots/storyshots-core/package.json # addons/storyshots/storyshots-puppeteer/package.json # app/angular/package.json # app/aurelia/package.json # app/ember/package.json # app/html/package.json # app/marionette/package.json # app/marko/package.json # app/mithril/package.json # app/preact/package.json # app/rax/package.json # app/react/package.json # app/riot/package.json # app/server/package.json # app/svelte/package.json # app/svelte/src/server/framework-preset-svelte.ts # app/vue/package.json # app/vue3/package.json # app/web-components/package.json # examples/cra-kitchen-sink/package.json # examples/cra-react15/package.json # examples/cra-ts-essentials/package.json # examples/cra-ts-kitchen-sink/package.json # examples/mithril-kitchen-sink/package.json # examples/react-ts/package.json # examples/svelte-kitchen-sink/package.json # examples/vue-3-cli/package.json # lib/cli/src/versions.json # lib/core/package.json # lib/ui/package.json # yarn.lock