Brandy Carney 4cd5834cfd 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

2017-06-12 13:33:33 -04:00

..

tasks

Merge branch 'master' into v4

2017-06-12 13:33:33 -04:00

utils

fix(): change e2e.prod so that it copies the core files.

2017-05-19 16:25:37 -05:00

constants.ts

chore(scripts): normalize paths and include typeRoots for Windows (#11933)

2017-06-05 18:57:05 -04:00

declarations.d.ts

chore(gulp): updates to build process to use app-scripts for watch/build

2017-03-02 14:28:15 -06:00

gulpfile.ts

chore(): ensure scripts match v4

2017-05-18 11:39:58 -05:00

tsconfig.json

chore(gulp): update gulp scripts

2016-09-13 15:09:39 -05:00

util.ts

Merge branch 'master' into v4

2017-06-12 13:33:33 -04:00