Quincy Larson 04de3ecf9b Merge branch 'master' into staging

2015-06-01 17:07:33 -07:00

..

advanced-bonfires.json

add multi-lingual placeholders and update announcement modal

2015-05-28 01:32:56 -07:00

basejumps.json

one last json fix

2015-05-28 02:14:27 -07:00

basic-bonfires.json

close #767

2015-05-31 14:08:44 -07:00

basic-html5-and-css.json

normalize all instructions in html5-and-css challenges

2015-06-01 15:07:03 -07:00

basic-javascript.json

add multi-lingual placeholders and update announcement modal

2015-05-28 01:32:56 -07:00

bootstrap.json

normalize all instructions in bootstrap challenges

2015-06-01 16:10:28 -07:00

computer-science.json

add yet unfinished curriculum overview to challengeMap

2015-05-31 02:01:55 -07:00

full-stack-javascript.json

fix typos and improve copy up through google font challenge

2015-05-30 13:34:49 -07:00

functional-programming.json

Merge branch 'master' into modals

2015-05-28 17:25:34 -07:00

get-set-for-free-code-camp.json

move to freecodecamp.slack.com

2015-06-01 16:17:06 -07:00

intermediate-bonfires.json

add multi-lingual placeholders and update announcement modal

2015-05-28 01:32:56 -07:00

jquery-ajax-and-json.json

more minor fixes to json

2015-05-28 02:10:44 -07:00

object-oriented-javascript.json

add multi-lingual placeholders and update announcement modal

2015-05-28 01:32:56 -07:00

ziplines.json

one last json fix

2015-05-28 02:14:27 -07:00