Michael Q Larson be2e224f93 Merge branch 'footer' into one-column-challenges ...

Conflicts:
	public/css/main.less

2015-01-17 17:05:52 -08:00

..

lib

update ionic icons

2015-01-08 18:08:44 -08:00

themes

update the hackathon starter base app

2014-11-29 21:32:59 -08:00

main.less

Merge branch 'footer' into one-column-challenges

2015-01-17 17:05:52 -08:00