Quincy Larson 2b39b22d67 Merge branch 'lumenteun-763' of https://github.com/LumenTeun/freecodecamp into LumenTeun-lumenteun-763 ...

Conflicts:
	seed_data/challenges/basic-html5-and-css.json

2015-05-30 20:16:22 -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

Merge pull request #696 from LumenTeun/lumenteun-mutations

2015-05-30 20:04:41 -07:00

basic-html5-and-css.json

Merge branch 'lumenteun-763' of https://github.com/LumenTeun/freecodecamp into LumenTeun-lumenteun-763

2015-05-30 20:16:22 -07:00

basic-javascript.json

add multi-lingual placeholders and update announcement modal

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

bootstrap.json

close more issues related to typos and tests

2015-05-30 01:49:00 -07:00

computer-science.json

typo

2015-05-28 21:52:53 -05: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

spanish computer-science corrections, get-set-for-fcc translation finished

2015-05-28 20:44:49 -05: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