mirror of
https://github.com/freeCodeCamp/freeCodeCamp.git
synced 2026-06-02 16:01:34 -04:00
Conflicts: bower.json client/main.js server/views/coursewares/showZiplineOrBasejump.jade server/views/partials/scripts.jade
Everything to do with the server.
One file that is not tracked here is rev-manifest.json.
It is generated at runtime and its contents changes as the contents
of client side files change.