A powerful cross-platform UI toolkit for building native-quality iOS, Android, and Progressive Web Apps with HTML, CSS, and JavaScript.
Merge branch 'master' into v4
# Conflicts: # .scss-lint.yml # README.md # scripts/gulp/tasks/e2e.dev.ts # scripts/gulp/util.ts # src/components/action-sheet/action-sheet-component.ts # src/components/card/card.ios.scss # src/components/card/card.md.scss # src/components/card/card.wp.scss # src/components/card/test/map/main.html # src/components/card/test/social/main.html # src/components/slides/slides.scss # src/components/slides/slides.ts # src/components/toggle/toggle.ios.scss # src/components/toggle/toggle.ts # src/themes/ionic.mixins.scss
B
Brandy Carney committed
4cd5834cfd585cca32ba84626da939314ac412cf