Michael Q Larson 4d3337df32 Merge branch 'ziplines' into ux-improvements ...

Conflicts:
	views/coursewares/showJS.jade

2015-03-28 00:24:41 -07:00

..

css

continue work on the param-based funnel

2015-03-26 23:33:52 -07:00

fonts

remove CDN call for bootstrap and font awesome and get them loading locally

2015-03-06 23:56:22 -08:00

images

start redesign with new logo

2014-11-07 13:25:08 -08:00

js

Merge branch 'ziplines' into ux-improvements

2015-03-28 00:24:41 -07:00

browserconfig.xml

update the favicons and add recommended items to public folder

2015-02-02 16:23:24 -08:00

favicon.ico

start adding new favicons and make the seed task run with each push to heroku

2015-02-02 15:27:12 -08:00

favicons.html

update the favicons and add recommended items to public folder

2015-02-02 16:23:24 -08:00

robots.txt

SEO improvements suggested by Mark

2014-11-23 15:08:46 -06:00