mirror of
https://github.com/storybookjs/storybook.git
synced 2025-04-06 15:31:16 +08:00
f893431a8d
# Conflicts: # addons/cssresources/src/register.tsx # addons/notes/src/Panel.tsx # addons/notes/src/giphy.tsx # examples/official-storybook/stories/core/parameters.stories.js # lib/api/src/init-provider-api.ts # lib/api/src/lib/id.ts # lib/api/src/modules/addons.ts # lib/api/src/modules/layout.ts # lib/api/src/modules/stories.ts # lib/api/src/modules/url.ts # lib/api/src/modules/versions.ts # lib/api/src/store.ts # lib/api/src/tests/id.test.js # lib/api/src/tests/versions.test.js # lib/client-api/src/client_api.js # lib/client-logger/src/index.ts # lib/router/package.json # lib/router/src/tests/id.test.js # lib/router/src/typings.d.ts # lib/router/src/utils.ts # lib/theming/src/themes/dark-syntax.ts # lib/theming/src/themes/dark.ts # lib/theming/src/themes/light-syntax.ts # lib/theming/src/themes/light.ts # lib/ui/package.json # lib/ui/src/components/sidebar/treeview/utils.js # lib/ui/src/containers/nav.js # lib/ui/src/containers/preview.js # lib/ui/src/core/context.js # lib/ui/src/core/initial-state.js # lib/ui/src/index.js # lib/ui/src/libs/id.test.js # lib/ui/src/settings/__snapshots__/shortcuts.stories.storyshot # lib/ui/src/settings/about_page.js # lib/ui/src/settings/shortcuts.stories.js # lib/ui/src/settings/shortcuts_page.js # yarn.lock