Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
Conflicts: views/resources/live-pair-programming.jade
This commit is contained in:
@ -88,4 +88,4 @@ html(ng-app='profileValidation', lang='en')
|
||||
ga('create', 'UA-55446531-1', 'auto');
|
||||
ga('require', 'displayfeatures');
|
||||
ga('send', 'pageview');
|
||||
script(src="//cdn.optimizely.com/js/999692993.js")
|
||||
script(src="//cdn.optimizely.com/js/999692993.js")
|
||||
|
Reference in New Issue
Block a user