mirror of
https://github.com/storybookjs/storybook.git
synced 2025-04-04 20:51:07 +08:00
# Conflicts: # addons/comments/src/manager/components/CommentItem/index.js # addons/comments/src/manager/containers/CommentsPanel/dataStore.js # addons/comments/src/manager/containers/CommentsPanel/index.js # addons/info/src/components/PropTable.js # lib/cli/bin/generate.js # lib/cli/generators/UPDATE_PACKAGE_ORGANIZATIONS/index.js # lib/ui/src/modules/ui/components/addon_panel/index.test.js # scripts/test.js