Commit Graph

9 Commits

Author SHA1 Message Date
Adam Bradley
7cead033e9 delete diff .orig files 2014-02-28 11:29:30 -06:00
Adam Bradley
3e34a84abe Merge branch 'master' of https://github.com/driftyco/ionic
Conflicts:
	package.json
	release/js/ionic-angular.js
	release/js/ionic-angular.min.js
	release/js/ionic.bundle.js
	release/js/ionic.bundle.min.js
	release/version.json
2014-02-28 10:47:57 -06:00
Andy Joslin
41b4f169aa chore(): hotfix for v0.9.26 2014-02-26 16:21:25 -05:00
Andy Joslin
e209ec6c4d chore(release): v0.9.26 "rabbit" 2014-02-26 15:09:39 -05:00
Andy Joslin
498706b157 chore(release): v0.9.26 "rabbit" 2014-02-26 14:38:26 -05:00
Andy Joslin
89b69d0d57 chore(release): v0.9.25 "quokka" 2014-02-19 11:52:06 -05:00
Adam Bradley
01cfda04ac chore(release): v0.9.24 2014-02-12 09:12:08 -06:00
Adam Bradley
2f6ac4a986 chore(release): v0.9.23 2014-02-05 12:07:01 -05:00
Andy Joslin
456dc2b9f2 chore(build): more ci server automation 2014-02-04 22:33:42 -05:00