Adam Bradley cae0c0e050 Merge branch 'master' into v4 ...

# Conflicts:
#	package.json
#	src/components/badge/badge.scss
#	src/components/slides/slides.scss

2017-05-02 12:55:07 -05:00

..

test/basic

feat(badge): update badge to ionic core

2017-04-18 15:33:46 -05:00

badge.ios.scss

feat(badge): update badge to ionic core

2017-04-18 15:33:46 -05:00

badge.md.scss

feat(badge): update badge to ionic core

2017-04-18 15:33:46 -05:00

badge.scss

Merge branch 'master' into v4

2017-05-02 12:55:07 -05:00

badge.ts

fix(build): update angular build process

2017-04-26 15:26:25 -05:00

badge.wp.scss

feat(badge): update badge to ionic core

2017-04-18 15:33:46 -05:00