Max Lynch 95280cd629 Merge branch 'master' of https://github.com/driftyco/ionic ...

Conflicts:
	dist/css/ionic-scoped.css

2013-10-21 21:01:14 -05:00

..

fonts

updated ionicons to v1.1

2013-10-16 19:55:19 -05:00

ionic-ios7.css

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

2013-10-21 21:01:14 -05:00

ionic-scoped.css

Simpler content area and fixed nav ctrl

2013-10-21 21:00:26 -05:00

ionic.css

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

2013-10-21 21:01:14 -05:00