Max Lynch 306dd467fe Merge branch 'master' of https://github.com/driftyco/ionic ...

Conflicts:
	js/ext/angular/test/content.html

2014-03-18 17:53:22 -05:00

..

controllers

chore: remove animation & type attributes, standard controller names

2014-03-18 14:54:21 -06:00

ext/angular

Merge branch 'master' of https://github.com/driftyco/ionic

2014-03-18 17:53:22 -05:00

utils

fix docs method names

2014-03-18 13:19:38 -05:00

views

fix scrolling through list causes "active" class on items

2014-03-17 13:47:04 -05:00

ionic.js

chore(release): v0.9.26 "rabbit"

2014-02-26 15:09:39 -05:00