Merge branch 'master' into staging

This commit is contained in:
Quincy Larson
2015-05-31 12:33:52 -07:00

View File

@ -282,7 +282,7 @@
" <h3>Find your city below and join their group. This is a great way to hang out with other coders, share insights, and pair program.</h3>",
" <h4>",
" <ol>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.ahmedabad/' target='_blank'>Ahmedabad</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.albany.ny/' target='_blank'>Albany</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.berkeley/' target='_blank'>Alameda</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.amsterdam/' target='_blank'>Amsterdam</a></li>",
@ -350,6 +350,7 @@
" <li><a href='https://www.facebook.com/groups/free.code.camp.hochiminhcity/' target='_blank'>Ho Chi Minh City</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.hyderabad/' target='_blank'>Hyderabad</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.joao.pessoa/' target='_blank'>Joao Pessoa</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.johannesburg/' target='_blank'>Johannesburg</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.kaduna/' target='_blank'>Kaduna</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.kalamazoo/' target='_blank'>Kalamazoo</a></li>",
" <li><a href='https://www.facebook.com/groups/free.code.camp.kansascity/' target='_blank'>Kansas City</a></li>",
@ -451,7 +452,7 @@
" <li>Click the \"Upload a photo button. To start out, you'll probably just want to use Free Code Camp's banner (download it <a href='https://s3.amazonaws.com/freecodecamp/wide-social-banner.png'>here</a>), or a scenic shot of your city. Later you can update this with a picture from one of your city's Free Code Camp events.</li>",
" <img class='img-responsive img-center' src='https://www.evernote.com/shard/s116/sh/fabe226a-5a26-4508-b015-1dac35192a21/37f8119dc57845a31e972217714b038b/deep/0/Free-Code-Camp-Testland.png' alt='A screenshot showing the \"Upload a photo\" button.'>",
" <li>Message @quincylarson in Slack with a link to your city's group page and he'll include it here.</li>",
" <li>Join our #local-group-leaders channel on Slack, where we share ideas about involving campers in your city.</li>",
" <li>Join our <a href='https://www.facebook.com/groups/freecodecampers/'>Local Leaders Facebook group</a>, where we share ideas about involving campers in your city.</li>",
" </ol>",
" </p>",
" <p class='large-p'>If you don't have a Facebook page, we strongly recommend you create one, even if it's just for the purpose of coordinating with campers in your city through this group.</p>",