Adam Bradley 974a70cf0e Merge branch 'master' into alpha38 ...

Conflicts:
	ionic/components/popup/popup.ts

2015-10-05 16:43:30 -05:00

..

modes

fix(ripple): outline colors

2015-09-28 15:55:37 -05:00

test/basic

alpha38, first pass

2015-10-03 16:02:24 -05:00

segment.scss

style(segment): Remove margin on first and last elements

2015-10-05 15:27:04 -06:00

segment.ts

alpha38, first pass

2015-10-03 16:02:24 -05:00