Michael Q Larson ffddd86022 Merge branch 'master' into helmet ...

Conflicts:
	controllers/resources.js
	package.json
	views/partials/meta.jade

2014-12-22 11:49:51 -08:00

..

api.js

API code cleanup

2014-10-27 19:58:38 -07:00

challenges.js

update to automatically redirect based on highest completed challenge hash value

2014-12-16 10:31:19 -08:00

contact.js

SEO improvements suggested by Mark

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

home.js

update to automatically redirect based on highest completed challenge hash value

2014-12-16 10:31:19 -08:00

resources.js

Merge branch 'master' into helmet

2014-12-22 11:49:51 -08:00

user.js

Merge branch 'timestamp' into challenges

2014-12-13 21:09:11 -08:00