Quincy Larson 3d08496eb8 Merge branch 'staging' into bonfire-tests ...

Conflicts:
	seed/challenges/basic-bonfires.json
	seed/challenges/intermediate-bonfires.json

2015-09-14 00:24:33 -07:00

..

advanced-bonfires.json

Fix assertions for Bonfire: Symmetric Difference

2015-08-31 10:52:48 +03:00

angularjs.json

resequence some challenges

2015-08-15 14:23:10 -07:00

automated-testing-and-debugging.json

fix typeof wording

2015-09-04 15:22:45 -07:00

basejumps.json

switch backticks for doublequotes and fix the git.json file as well

2015-09-13 20:44:25 -07:00

basic-bonfires.json

Merge branch 'staging' into bonfire-tests

2015-09-14 00:24:33 -07:00

basic-javascript.json

Merge branch 'patch-4' of https://github.com/souldreamer/FreeCodeCamp into souldreamer-patch-4

2015-09-13 23:35:27 -07:00

basic-ziplines.json

Updated instructions to ziplines intro challenge

2015-09-13 07:04:18 +08:00

bootstrap.json

Merge pull request #3263 from leonfeng/leonfeng-fix-3260

2015-09-12 23:29:54 -07:00

git.json

switch backticks for doublequotes and fix the git.json file as well

2015-09-13 20:44:25 -07:00

hikes.json

add type to challenges

2015-08-07 23:37:32 -07:00

html5-and-css.json

Merge pull request #3278 from awesomeaniruddh/awesomeaniruddh-3276

2015-09-13 19:50:48 -07:00

intermediate-bonfires.json

Merge branch 'staging' into bonfire-tests

2015-09-14 00:24:33 -07:00

intermediate-ziplines.json

update feedback copy for ziplines and basejumps

2015-09-09 20:05:10 -07:00

jquery.json

Merge pull request #3261 from awesomeaniruddh/awesomeaniruddh-2065

2015-09-12 23:02:33 -07:00

mongodb.json

switch backticks for doublequotes and fix the git.json file as well

2015-09-13 20:44:25 -07:00

nodejs-and-expressjs.json

switch backticks for doublequotes and fix the git.json file as well

2015-09-13 20:44:25 -07:00

object-oriented-and-functional-programming.json

Merge pull request #3185 from awesomeaniruddh/awesomeaniruddh-3172

2015-09-09 14:08:49 -07:00

upper-intermediate-bonfires.json

replace RSAP with read-search-ask and replace AWS gifs with Imgur

2015-08-13 00:56:05 -07:00