mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-08-20 04:14:21 +08:00
e50dc31d93
# Conflicts: # README.md # package.json # src/components/action-sheet/action-sheet-component.ts # src/components/badge/badge.scss # src/components/card/card.ios.scss # src/components/card/card.md.scss # src/components/card/card.wp.scss # src/components/scroll/scroll.scss # src/components/scroll/scroll.ts # src/components/scroll/test/basic/main.html # src/components/slides/slides.scss # src/components/slides/swiper/swiper-effects.ts # src/components/slides/swiper/swiper-events.ts # src/components/slides/swiper/swiper-parallax.ts # src/components/slides/swiper/swiper.ts # src/components/toggle/test/toggle.spec.ts # src/components/toggle/toggle-gesture.ts # src/components/toggle/toggle.ios.scss # src/components/toggle/toggle.md.scss # src/components/toggle/toggle.ts # src/components/toggle/toggle.wp.scss # src/themes/ionic.mixins.scss