Go to file
Contegix Support 5f536f644d Merging README
2015-04-12 18:26:18 -05:00
fonts migration from GitLab 2014-12-16 18:21:50 -06:00
images migration from GitLab 2014-12-16 18:21:50 -06:00
javascripts migration from GitLab 2014-12-16 18:21:50 -06:00
stylesheets migration from GitLab 2014-12-16 18:21:50 -06:00
CNAME migration from GitLab 2014-12-16 18:21:50 -06:00
index.html updated site to current 2015-04-12 18:25:06 -05:00
params.json migration from GitLab 2014-12-16 18:21:50 -06:00
README.md Merging README 2015-04-12 18:26:18 -05:00

<<<<<<< HEAD MattBurchett.com

I have forked the JupiterColony.com repository from Rikai. I am putting my own spin on things, and making it my own as a landing page for myself.

JupiterColony

Collaborative design of the JupiterColony landing page, a repository for the site and for design documents/goals.

Notes

Both active branches welcome merge requests tha make sense. @rikai and @ChrisLAS have final say on design decisions.

  • The master branch will contain style and content documents to help focus the direction, as this is a community effort.
  • The gh-pages branch contains the actual site, and is what pull requests for changes to the live site should be filed against.

2a0d3f80ad