-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit 96677eb
committed
Merge branch 'translation/jp' of github.com:ionic-team/ionic-docs into translation/jp
# Conflicts:
# docs/api/accordion-group.md
# docs/api/accordion.md
# docs/api/action-sheet.md
# docs/api/alert.md
# docs/api/app.md
# docs/api/avatar.md
# docs/api/back-button.md
# docs/api/backdrop.md
# docs/api/badge.md
# docs/api/breadcrumb.md
# docs/api/breadcrumbs.md
# docs/api/button.md
# docs/api/buttons.md
# docs/api/card-content.md
# docs/api/card-header.md
# docs/api/card-subtitle.md
# docs/api/card-title.md
# docs/api/card.md
# docs/api/checkbox.md
# docs/api/chip.md
# docs/api/col.md
# docs/api/content.md
# docs/api/datetime.md
# docs/api/fab-button.md
# docs/api/fab-list.md
# docs/api/fab.md
# docs/api/footer.md
# docs/api/grid.md
# docs/api/header.md
# docs/api/img.md
# docs/api/infinite-scroll-content.md
# docs/api/infinite-scroll.md
# docs/api/input.md
# docs/api/item-divider.md
# docs/api/item-group.md
# docs/api/item-option.md
# docs/api/item-options.md
# docs/api/item-sliding.md
# docs/api/item.md
# docs/api/label.md
# docs/api/list-header.md
# docs/api/list.md
# docs/api/loading.md
# docs/api/menu-button.md
# docs/api/menu-toggle.md
# docs/api/menu.md
# docs/api/modal.md
# docs/api/nav-link.md
# docs/api/nav.md
# docs/api/note.md
# docs/api/picker.md
# docs/api/popover.md
# docs/api/progress-bar.md
# docs/api/radio-group.md
# docs/api/radio.md
# docs/api/range.md
# docs/api/refresher-content.md
# docs/api/refresher.md
# docs/api/reorder-group.md
# docs/api/reorder.md
# docs/api/ripple-effect.md
# docs/api/route-redirect.md
# docs/api/route.md
# docs/api/router-link.md
# docs/api/router-outlet.md
# docs/api/router.md
# docs/api/row.md
# docs/api/searchbar.md
# docs/api/segment-button.md
# docs/api/segment.md
# docs/api/select-option.md
# docs/api/select.md
# docs/api/skeleton-text.md
# docs/api/slide.md
# docs/api/spinner.md
# docs/api/split-pane.md
# docs/api/tab-bar.md
# docs/api/tab-button.md
# docs/api/tab.md
# docs/api/tabs.md
# docs/api/text.md
# docs/api/textarea.md
# docs/api/thumbnail.md
# docs/api/title.md
# docs/api/toast.md
# docs/api/toggle.md
# docs/api/toolbar.md
# scripts/api-playground-init.js
# static/usage/breadcrumbs/styling/color/angular.md
# static/usage/breadcrumbs/styling/color/demo.html
# static/usage/breadcrumbs/styling/color/index.md
# static/usage/breadcrumbs/styling/color/javascript.md
# static/usage/breadcrumbs/styling/color/react.md
# static/usage/breadcrumbs/styling/color/vue.md
# static/usage/breadcrumbs/styling/css-props/angular/angular_css.md
# static/usage/breadcrumbs/styling/css-props/angular/angular_html.md
# static/usage/breadcrumbs/styling/css-props/demo.html
# static/usage/breadcrumbs/styling/css-props/javascript.md
# static/usage/breadcrumbs/styling/css-props/react/react_css.md
# static/usage/breadcrumbs/styling/css-props/react/react_ts.md
# static/usage/breadcrumbs/styling/css-props/vue.md
# static/usage/breadcrumbs/theming/colors/angular.md
# static/usage/breadcrumbs/theming/colors/demo.html
# static/usage/breadcrumbs/theming/colors/index.md
# static/usage/breadcrumbs/theming/colors/javascript.md
# static/usage/breadcrumbs/theming/colors/react.md
# static/usage/breadcrumbs/theming/colors/vue.md
# static/usage/breadcrumbs/theming/css-properties/angular/angular_css.md
# static/usage/breadcrumbs/theming/css-properties/angular/angular_html.md
# static/usage/breadcrumbs/theming/css-properties/demo.html
# static/usage/breadcrumbs/theming/css-properties/index.md
# static/usage/breadcrumbs/theming/css-properties/javascript.md
# static/usage/breadcrumbs/theming/css-properties/react/react_css.md
# static/usage/breadcrumbs/theming/css-properties/react/react_ts.md
# static/usage/breadcrumbs/theming/css-properties/vue.md
# static/usage/range/css-shadow-parts/angular/app_component_css.md
# static/usage/range/css-shadow-parts/demo.html
# static/usage/range/css-shadow-parts/index.md
# static/usage/range/css-shadow-parts/javascript.md
# static/usage/range/css-shadow-parts/react/main_css.md
# static/usage/range/css-shadow-parts/vue.md
# static/usage/range/css-variables/angular/app_component_css.md
# static/usage/range/css-variables/demo.html
# static/usage/range/css-variables/index.md
# static/usage/range/css-variables/javascript.md
# static/usage/range/css-variables/react/main_css.md
# static/usage/range/css-variables/vue.md
# static/usage/range/theming/css-properties/angular/app_component_css.md
# static/usage/range/theming/css-properties/angular/app_component_html.md
# static/usage/range/theming/css-properties/demo.html
# static/usage/range/theming/css-properties/index.md
# static/usage/range/theming/css-properties/javascript.md
# static/usage/range/theming/css-properties/react/main_css.md
# static/usage/range/theming/css-properties/react/main_tsx.md
# static/usage/range/theming/css-properties/vue.md
# static/usage/range/theming/css-shadow-parts/angular/app_component_css.md
# static/usage/range/theming/css-shadow-parts/angular/app_component_html.md
# static/usage/range/theming/css-shadow-parts/demo.html
# static/usage/range/theming/css-shadow-parts/index.md
# static/usage/range/theming/css-shadow-parts/javascript.md
# static/usage/range/theming/css-shadow-parts/react/main_css.md
# static/usage/range/theming/css-shadow-parts/react/main_tsx.md
# static/usage/range/theming/css-shadow-parts/vue.md
# static/usage/v6/breadcrumbs/theming/colors/angular.md
# static/usage/v6/breadcrumbs/theming/colors/demo.html
# static/usage/v6/breadcrumbs/theming/colors/index.md
# static/usage/v6/breadcrumbs/theming/colors/javascript.md
# static/usage/v6/breadcrumbs/theming/colors/react.md
# static/usage/v6/breadcrumbs/theming/colors/vue.md
# static/usage/v6/breadcrumbs/theming/css-properties/angular/example_component_css.md
# static/usage/v6/breadcrumbs/theming/css-properties/angular/example_component_html.md
# static/usage/v6/breadcrumbs/theming/css-properties/demo.html
# static/usage/v6/breadcrumbs/theming/css-properties/javascript.md
# static/usage/v6/breadcrumbs/theming/css-properties/react/main_css.md
# static/usage/v6/breadcrumbs/theming/css-properties/react/main_tsx.md
# static/usage/v6/breadcrumbs/theming/css-properties/vue.md
# static/usage/v6/datetime/theming/index.md
# static/usage/v6/range/theming/css-properties/angular/example_component_css.md
# static/usage/v6/range/theming/css-properties/demo.html
# static/usage/v6/range/theming/css-properties/javascript.md
# static/usage/v6/range/theming/css-properties/react/main_css.md
# static/usage/v6/range/theming/css-properties/vue.md
# static/usage/v6/range/theming/css-shadow-parts/angular/example_component_css.md
# static/usage/v6/range/theming/css-shadow-parts/demo.html
# static/usage/v6/range/theming/css-shadow-parts/javascript.md
# static/usage/v6/range/theming/css-shadow-parts/react/main_css.md
# static/usage/v6/range/theming/css-shadow-parts/vue.md
# static/usage/v7/loading/theming/index.md
# versioned_docs/version-v6/api/slides.md
# versioned_docs/version-v6/api/virtual-scroll.mdFile tree
0 file changed
+0
-0
lines changedFilter options
0 file changed
+0
-0
lines changed
0 commit comments