Commit Graph

5 Commits

Author SHA1 Message Date
Max Lynch
15e7f304f6 Merge branch 'master' of https://github.com/driftyco/ionic
Conflicts:
	dist/js/ionic-angular.min.js
	dist/js/ionic.min.js
2014-01-10 09:53:33 -06:00
Adam Bradley
cfdefd452e update w/ ui-router 2014-01-07 19:50:39 -06:00
Adam Bradley
eebfbb45fe update script references, fixes #233 2013-11-28 23:01:04 -06:00
Max Lynch
574d92fed7 Fixed old angular includes in examples 2013-11-15 08:48:55 -06:00
Max Lynch
eb7bc3edba Cleaned up examples folder 2013-11-07 10:01:01 -06:00