dokkillo c8b32afaeb Merge remote-tracking branch 'upstream/staging' into staging ...

Conflicts:
	seed/challenges/html5-and-css.json

2015-08-20 16:46:06 +02:00

..

advanced-bonfires.json

Fixed issue #1806

2015-08-16 20:38:49 -04:00

angularjs.json

resequence some challenges

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

automated-testing-and-debugging.json

add types to testing waypoints

2015-08-18 21:49:16 -07:00

basejumps.json

add type to challenges

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

basic-bonfires.json

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

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

basic-javascript.json

Merge pull request #2235 from dokkillo/dokkillo-2218

2015-08-19 23:14:09 +01:00

basic-ziplines.json

Merge pull request #1939 from ayampol/ayampol-1928

2015-08-19 21:35:02 +01:00

bootstrap.json

issue #2118

2015-08-19 21:00:39 +02:00

git.json

resequence some challenges

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

hikes.json

add type to challenges

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

intermediate-bonfires.json

fix #935

2015-08-16 20:59:17 -04:00

intermediate-ziplines.json

resequence some challenges

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

jquery.json

Merge pull request #1995 from jbmartinez/jbmartinez-1833

2015-08-19 21:29:50 +01:00

mongodb.json

resequence some challenges

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

nodejs-and-expressjs.json

resequence some challenges

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

object-oriented-and-functional-programming.json

Fixed typo in waypoints #1 and #2

2015-08-18 21:35:10 +10: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