2 Commits

Author SHA1 Message Date
ff8169cb0a Merge branch 'master' into searchbar-fix
# Conflicts:
#	ionic/components/searchbar/searchbar.ts
2015-12-10 17:55:44 -05:00
90e136ec77 fix(slides): removed absolute positioning so the slides can be in fixed height
added a new test for this. Closes #642
2015-11-25 12:06:52 -05:00