mirror of
https://github.com/storybookjs/storybook.git
synced 2025-04-06 07:21:16 +08:00
# Conflicts: # examples/official-storybook/config.js # lib/cli/test/snapshots/angular-cli/package.json # lib/cli/test/snapshots/meteor/package.json # lib/cli/test/snapshots/react/package.json # lib/cli/test/snapshots/react_native/package.json # lib/cli/test/snapshots/react_native_scripts/package.json # lib/cli/test/snapshots/react_project/package.json # lib/cli/test/snapshots/react_scripts/package.json # lib/cli/test/snapshots/sfc_vue/package.json # lib/cli/test/snapshots/update_package_organisations/package.json # lib/cli/test/snapshots/vue/package.json # lib/cli/test/snapshots/webpack_react/package.json