Adam Bradley 406292a289 Merge branch 'master' of https://github.com/driftyco/ionic ...

Conflicts:
	dist/css/ionic-ios7.css

2013-10-24 20:25:54 -05:00

..

css

item-body

2013-10-24 20:20:49 -05:00

js

Don't even try to use the scroll shit, it's broken

2013-10-24 18:56:27 -05:00