Adam Bradley 50b6fdea8d Merge branch 'master' into alpha38 ...

Conflicts:
	ionic/components/search-bar/search-bar.ts
	ionic/config/decorators.ts

2015-10-06 20:38:04 -05:00

..

app.ts

IonicApp api doc

2015-10-06 16:29:05 -05:00

id.ts

chore(): rename properties to inputs, events to outputs

2015-10-06 16:28:32 -05:00

normalize.scss

css cleanup

2015-09-05 21:02:45 -05:00

structure.scss

feat(item): sliding items

2015-10-06 18:30:46 -05:00

typography.scss

refactor(navbar): improved navbar transitions

2015-09-23 23:17:06 -05:00