Max Lynch 8be060124a Merge branch 'master' of https://github.com/driftyco/ionic ...

Conflicts:
	dist/js/ionic-angular.min.js

2014-01-12 20:25:23 -06:00

..

controllers

delete unused nav router stuff

2014-01-10 15:26:13 -06:00

ext/angular

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

2014-01-12 20:25:23 -06:00

utils

Fixed #366 - no Android scroll bouncing by default

2014-01-10 09:52:32 -06:00

views

Fixed loading view width for #364

2014-01-07 13:53:01 -06:00

_license.js

angular-ui router

2014-01-09 11:12:39 -06:00

ionic.js

version in dist files

2013-12-07 14:30:57 -06:00