Michael Q Larson f4fcb565f4 Merge branch 'master' into ux-improvements ...

Conflicts:
	seed_data/coursewares.json

2015-02-22 18:17:47 -08:00

..

lib

More UX improvements

2015-02-22 16:46:55 +09:00

themes

update the hackathon starter base app

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

main.less

Merge branch 'master' into ux-improvements

2015-02-22 18:17:47 -08:00