2015-04-12 23:26:18 +00:00
|
|
|
<<<<<<< HEAD
|
2014-12-17 00:00:32 +00:00
|
|
|
MattBurchett.com
|
2014-12-17 00:21:50 +00:00
|
|
|
=============
|
2014-12-17 00:00:32 +00:00
|
|
|
|
2015-04-12 23:26:18 +00:00
|
|
|
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.
|
|
|
|
|
=======
|
2013-09-04 05:35:07 +00:00
|
|
|
JupiterColony
|
|
|
|
|
=============
|
|
|
|
|
|
|
|
|
|
Collaborative design of the JupiterColony landing page, a repository for the site and for design documents/goals.
|
2013-09-04 05:41:29 +00:00
|
|
|
|
|
|
|
|
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.
|
2013-09-04 05:44:35 +00:00
|
|
|
* The gh-pages branch contains the actual site, and is what pull requests for changes to the live site should be filed against.
|
2015-04-12 23:26:18 +00:00
|
|
|
>>>>>>> 2a0d3f80ad2b6d2737581ecc5a983407bb088126
|
