Max Lynch 4fcad719a3 Merge branch 'master' of https://github.com/driftyco/ionic ...

Conflicts:
	dist/ionic-simple.js
	dist/ionic.js

2013-10-01 16:25:01 -05:00

..

navController.js

Tests organization and cleanup

2013-09-24 17:22:36 -05:00

routeController.js

Angular examples working again

2013-10-01 16:24:01 -05:00

sideMenuController.js

simple toggle stuff

2013-09-27 15:11:47 -05:00

tabBarController.js

Angular examples working again

2013-10-01 16:24:01 -05:00

viewController.js

move stuff to js/utils

2013-10-01 10:45:20 -05:00