Skip to content

Commit

Permalink
Merge branch 'translation/jp' of github.com:ionic-team/ionic-docs
Browse files Browse the repository at this point in the history
# Conflicts:
#	docs/api/action-sheet.md
#	docs/api/alert.md
#	docs/api/button.md
#	docs/api/card-title.md
#	docs/api/datetime-button.md
#	docs/api/datetime.md
#	docs/api/input.md
#	docs/api/menu.md
#	docs/api/modal.md
#	docs/api/nav-link.md
#	docs/api/nav.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.md
#	docs/api/row.md
#	docs/api/select.md
#	docs/api/spinner.md
#	docs/api/textarea.md
#	docs/api/toast.md
#	docs/developing/android.md
#	docs/developing/config/global/index.md
#	docs/developing/config/per-component/index.md
#	docs/developing/config/per-platform-fallback/index.md
#	docs/developing/config/per-platform-overrides/index.md
#	docs/developing/config/per-platform/index.md
#	docs/developing/ios.md
#	docs/developing/previewing.md
#	docs/native-setup.md
#	docs/react/lifecycle.md
#	docs/theming/advanced.md
#	docs/theming/dark-mode.md
#	docs/troubleshooting/native.md
#	scripts/data/translated-api.json
#	scripts/data/translated-cache.json
#	scripts/data/translated-cli.json
#	scripts/i18n.sh
#	sidebars.js
#	src/components/global/Playground/index.tsx
#	src/components/global/Playground/playground.css
#	src/components/page/reference/ReleaseNotes/release-notes.json
#	src/translate/.detection/api/action-sheet.json
#	src/translate/.detection/api/alert.json
#	src/translate/.detection/api/button.json
#	src/translate/.detection/api/checkbox.json
#	src/translate/.detection/api/datetime.json
#	src/translate/.detection/api/input.json
#	src/translate/.detection/api/loading.json
#	src/translate/.detection/api/modal.json
#	src/translate/.detection/api/nav.json
#	src/translate/.detection/api/picker.json
#	src/translate/.detection/api/popover.json
#	src/translate/.detection/api/radio.json
#	src/translate/.detection/api/range.json
#	src/translate/.detection/api/reorder-group.json
#	src/translate/.detection/api/router.json
#	src/translate/.detection/api/searchbar.json
#	src/translate/.detection/api/segment-button.json
#	src/translate/.detection/api/segment.json
#	src/translate/.detection/api/select.json
#	src/translate/.detection/api/textarea.json
#	src/translate/.detection/api/toast.json
#	src/translate/.detection/api/toggle.json
#	src/translate/api/action-sheet.json
#	src/translate/api/alert.json
#	src/translate/api/button.json
#	src/translate/api/checkbox.json
#	src/translate/api/datetime.json
#	src/translate/api/input.json
#	src/translate/api/loading.json
#	src/translate/api/modal.json
#	src/translate/api/nav.json
#	src/translate/api/picker.json
#	src/translate/api/popover.json
#	src/translate/api/radio.json
#	src/translate/api/range.json
#	src/translate/api/reorder-group.json
#	src/translate/api/router.json
#	src/translate/api/searchbar.json
#	src/translate/api/segment-button.json
#	src/translate/api/segment.json
#	src/translate/api/select.json
#	src/translate/api/textarea.json
#	src/translate/api/toast.json
#	src/translate/api/toggle.json
#	static/usage/modal/inline/is-open/javascript.md
#	static/usage/v7/alert/buttons/vue.md
#	static/usage/v7/alert/customization/vue.md
#	static/usage/v7/alert/inputs/radios/vue.md
#	static/usage/v7/alert/inputs/text-inputs/vue.md
#	static/usage/v7/alert/presenting/controller/vue.md
#	static/usage/v7/alert/presenting/isOpen/vue.md
#	static/usage/v7/alert/presenting/trigger/vue.md
#	static/usage/v7/input/counter/vue.md
#	static/usage/v7/modal/controller/vue/example_vue.md
#	static/usage/v7/modal/controller/vue/modal_vue.md
#	static/usage/v7/modal/custom-dialogs/vue.md
#	static/usage/v7/modal/inline/basic/vue.md
#	static/usage/v7/modal/inline/is-open/angular/example_component_html.md
#	static/usage/v7/modal/inline/is-open/vue.md
#	static/usage/v7/modal/performance/mount/vue.md
#	static/usage/v7/modal/sheet/auto-height/vue.md
#	static/usage/v7/modal/sheet/background-content/vue.md
#	static/usage/v7/modal/sheet/basic/vue.md
#	static/usage/v7/modal/sheet/handle-behavior/vue.md
#	static/usage/v7/modal/styling/animations/vue.md
#	static/usage/v7/modal/styling/theming/vue.md
#	static/usage/v7/range/ion-change-event/angular/example_component_html.md
#	static/usage/v7/range/ion-change-event/angular/example_component_ts.md
#	static/usage/v7/range/ion-change-event/demo.html
#	static/usage/v7/range/ion-change-event/index.md
#	static/usage/v7/range/ion-change-event/javascript.md
#	static/usage/v7/range/ion-change-event/react.md
#	static/usage/v7/range/ion-change-event/vue.md
#	versioned_docs/version-v6/developing/config/global/index.md
#	versioned_docs/version-v6/developing/config/per-component/index.md
#	versioned_docs/version-v6/developing/config/per-platform-fallback/index.md
#	versioned_docs/version-v6/developing/config/per-platform-overrides/index.md
#	versioned_docs/version-v6/developing/config/per-platform/index.md
#	versioned_docs/version-v6/native-setup.md
#	versioned_sidebars/version-v6-sidebars.json
  • Loading branch information
rdlabo committed Aug 31, 2023
2 parents e899a52 + f3c6259 commit f299f5d
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit f299f5d

Please sign in to comment.