Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

pull/1266/merge
Quincy Larson 2015-07-07 15:40:47 -07:00
commit 5378a3bbf4
1 changed files with 10 additions and 0 deletions

View File

@ -96,6 +96,16 @@
"san-francisco", "san-francisco",
"chicago" "chicago"
] ]
}, {
"name": "DevMountain",
"cost": "8900",
"housing": "0",
"finance": true,
"weeks": "12",
"cities": [
"provo",
"salt-lake-city"
]
}, { }, {
"name": "Epicodus", "name": "Epicodus",
"cost": "4500", "cost": "4500",