Adam Bradley 02f04c7322 Merge branch 'master' into alpha38 ...

Conflicts:
	ionic/config/decorators.ts

2015-10-07 13:56:16 -05:00

..

e2e.ts

test(search-bar): added tests for input focus animation

2015-10-06 17:28:20 -04:00

index.ts

Merge branch 'master' into alpha38

2015-10-07 13:56:16 -05:00

main.html

Fix(demo): Update search bar floating demo for custom cancel action

2015-10-06 17:01:42 -06:00