From 285365ecfc90a7a9584c0102684d755b2ed8f1cd Mon Sep 17 00:00:00 2001 From: rikai Date: Tue, 3 Sep 2013 22:35:07 -0700 Subject: [PATCH 1/3] Initial commit --- README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..aa35d8c --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +JupiterColony +============= + +Collaborative design of the JupiterColony landing page, a repository for the site and for design documents/goals. From b09e381da9b7d1a017caad98722075921b7ecea9 Mon Sep 17 00:00:00 2001 From: rikai Date: Wed, 4 Sep 2013 01:41:29 -0400 Subject: [PATCH 2/3] Update the readme to clarify what belongs where. --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index aa35d8c..9a42863 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,10 @@ 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. From 2a0d3f80ad2b6d2737581ecc5a983407bb088126 Mon Sep 17 00:00:00 2001 From: rikai Date: Wed, 4 Sep 2013 01:44:35 -0400 Subject: [PATCH 3/3] Whoops! Dash, not underscore. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9a42863..6b26b43 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,4 @@ 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. +* The gh-pages branch contains the actual site, and is what pull requests for changes to the live site should be filed against.