mirror of
https://github.com/storybookjs/storybook.git
synced 2025-04-09 00:19:13 +08:00
35d23fa640
# Conflicts: # lib/cli/test/snapshots/angular-cli/package.json # lib/cli/test/snapshots/marko/package.json # lib/cli/test/snapshots/meteor/package.json # lib/cli/test/snapshots/mithril/package.json # lib/cli/test/snapshots/polymer/package.json # lib/cli/test/snapshots/react/package.json # lib/cli/test/snapshots/react_babel_config_js/package.json # lib/cli/test/snapshots/react_babel_custom_preset/package.json # lib/cli/test/snapshots/react_babel_pkg_json/package.json # lib/cli/test/snapshots/react_babelrc/package.json # lib/cli/test/snapshots/react_babelrc_js/package.json # lib/cli/test/snapshots/react_project/package.json # lib/cli/test/snapshots/react_scripts/package.json # lib/cli/test/snapshots/react_static_next/package.json # lib/cli/test/snapshots/riot/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