Merge remote-tracking branch 'origin/staging' into staging

This commit is contained in:
benmcmahon100
2015-08-18 19:32:04 +01:00

View File

@@ -3,7 +3,7 @@
a.ion-speakerphone(href='http://blog.freecodecamp.com', target='_blank')  Blog  
a.ion-social-github(href="http://github.com/freecodecamp", target='_blank')  GitHub  
a.ion-social-twitch-outline(href="/twitch")  Twitch 
a.ion-social-linkedin(href="/linkedin")  LinkedIn 
a.ion-social-linkedin(href="https://www.linkedin.com/edu/school?id=166029", target='_blank')  LinkedIn 
a.ion-social-facebook(href="//facebook.com/freecodecamp")  Facebook  
a.ion-social-twitter(href="http://twitter.com/freecodecamp", target='_blank')  Twitter  
a.ion-locked(href="//github.com/FreeCodeCamp/freecodecamp/wiki/Free-Code-Camp's-Privacy-Policy")  Privacy  
@@ -14,7 +14,7 @@
span.sr-only Free Code Camp on GitHub
a.ion-social-twitch-outline(href="/twitch")
span.sr-only Free Code Camp Live Pair Programming on Twitch.tv
a.ion-social-linkedin(href="/linkedin")
a.ion-social-linkedin(href="https://www.linkedin.com/edu/school?id=166029", target='_blank')
span.sr-only Free Code Camp LinkedIn Alumni Network
a.ion-social-facebook(href="//facebook.com/freecodecamp")
span.sr-only Free Code Camp local groups on Facebook