mirror of
https://github.com/storybookjs/storybook.git
synced 2025-04-07 07:21:17 +08:00
# Conflicts: # addons/actions/package.json # addons/backgrounds/package.json # addons/notes/package.json # addons/storyshots/storyshots-core/package.json # lib/addons/package.json # lib/channel-websocket/package.json # lib/components/package.json # lib/core/src/client/preview/story_store.js # lib/core/src/server/manager/manager-webpack.config.js # lib/ui/package.json # lib/ui/src/modules/api/configs/init_api.js # lib/ui/src/modules/ui/components/menu_item.stories.js # lib/ui/src/modules/ui/components/search_box.stories.js # lib/ui/src/modules/ui/components/shortcuts_help.stories.js # lib/ui/src/modules/ui/components/stories_panel/index.stories.js # lib/ui/src/modules/ui/components/stories_panel/stories_tree/index.stories.js # lib/ui/src/modules/ui/components/stories_panel/text_filter.stories.js