From 0ecf632c65a6755874fd104beab5e9bc82098fc4 Mon Sep 17 00:00:00 2001 From: David Ross Date: Tue, 27 Sep 2016 10:38:37 +0100 Subject: [PATCH 01/25] extend hello world --- index.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 557db03..63f37f7 100644 --- a/index.html +++ b/index.html @@ -1 +1,5 @@ -Hello World +Hello World.. + +we're still a work in progress. Be sure to check out the Github repo for more info. + +Fork me on GitHub From d6e819c99cce321da297d68fc746a2338334ff45 Mon Sep 17 00:00:00 2001 From: David Ross Date: Tue, 27 Sep 2016 10:44:05 +0100 Subject: [PATCH 02/25] editing basic html5 layout --- index.html | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 63f37f7..93999ff 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,14 @@ -Hello World.. - -we're still a work in progress. Be sure to check out the Github repo for more info. + + + + + +Hello World.. +
+

we're still a work in progress. Be sure to check out the Github repo for more info.

+
+

Uniting open source decentralised projects and helping them engage the wider community. By providing regular streamed and in person meetups, we seek to educate, overview, and workshop to build personal skills and drive active contributors to these ground breaking technologies.

+
+

I'm working open because it's the way decentralisation works. People help, learn, problem solve, and build awesome things together.

Fork me on GitHub From dc68a57e13753f72b611f862230973b57c5d2724 Mon Sep 17 00:00:00 2001 From: David Ross Date: Tue, 27 Sep 2016 10:45:28 +0100 Subject: [PATCH 03/25] editing layout --- index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/index.html b/index.html index 93999ff..2eb4504 100644 --- a/index.html +++ b/index.html @@ -6,9 +6,7 @@ Hello World..

we're still a work in progress. Be sure to check out the Github repo for more info.

-

Uniting open source decentralised projects and helping them engage the wider community. By providing regular streamed and in person meetups, we seek to educate, overview, and workshop to build personal skills and drive active contributors to these ground breaking technologies.

-

I'm working open because it's the way decentralisation works. People help, learn, problem solve, and build awesome things together.

Fork me on GitHub From 0d9737e25f26c8f2ef50073e7fe7dc15bfe19452 Mon Sep 17 00:00:00 2001 From: David Ross Date: Tue, 27 Sep 2016 10:48:21 +0100 Subject: [PATCH 04/25] adding code of conduct link --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 2eb4504..1de861e 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ Hello World..
-

we're still a work in progress. Be sure to check out the Github repo for more info.

+

we're still a work in progress. Be sure to check out the Github repo and Code of Conduct for more info.

Uniting open source decentralised projects and helping them engage the wider community. By providing regular streamed and in person meetups, we seek to educate, overview, and workshop to build personal skills and drive active contributors to these ground breaking technologies.

I'm working open because it's the way decentralisation works. People help, learn, problem solve, and build awesome things together.

From 213eb17fe10065614bcfd607be639fc8d5b2b10c Mon Sep 17 00:00:00 2001 From: David Ross Date: Tue, 27 Sep 2016 10:49:21 +0100 Subject: [PATCH 05/25] adding linebreak --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 1de861e..4810ea5 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,7 @@ Hello World..

we're still a work in progress. Be sure to check out the Github repo and Code of Conduct for more info.

-

Uniting open source decentralised projects and helping them engage the wider community. By providing regular streamed and in person meetups, we seek to educate, overview, and workshop to build personal skills and drive active contributors to these ground breaking technologies.

+

Uniting open source decentralised projects and helping them engage the wider community.
By providing regular streamed and in person meetups, we seek to educate, overview, and workshop to build personal skills and drive active contributors to these ground breaking technologies.

I'm working open because it's the way decentralisation works. People help, learn, problem solve, and build awesome things together.

Fork me on GitHub From e26cc9c243686ddffffc35e30cb9ced7e691de1e Mon Sep 17 00:00:00 2001 From: David Ross Date: Tue, 27 Sep 2016 10:50:27 +0100 Subject: [PATCH 06/25] adding another linebreak --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 4810ea5..5b0afa4 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,7 @@ Hello World..

we're still a work in progress. Be sure to check out the Github repo and Code of Conduct for more info.

-

Uniting open source decentralised projects and helping them engage the wider community.
By providing regular streamed and in person meetups, we seek to educate, overview, and workshop to build personal skills and drive active contributors to these ground breaking technologies.

+

Uniting open source decentralised projects and helping them engage the wider community.
By providing regular streamed and in person meetups, we seek to educate, overview, and workshop
to build personal skills and drive active contributors to these ground breaking technologies.

I'm working open because it's the way decentralisation works. People help, learn, problem solve, and build awesome things together.

Fork me on GitHub From 85a75b33c96f6b8fc8b542cccc94130d8d2c4ba6 Mon Sep 17 00:00:00 2001 From: David Ross Date: Tue, 27 Sep 2016 10:53:11 +0100 Subject: [PATCH 07/25] adding working open link --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 5b0afa4..997faf0 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,6 @@

we're still a work in progress. Be sure to check out the Github repo and Code of Conduct for more info.

Uniting open source decentralised projects and helping them engage the wider community.
By providing regular streamed and in person meetups, we seek to educate, overview, and workshop
to build personal skills and drive active contributors to these ground breaking technologies.

-

I'm working open because it's the way decentralisation works. People help, learn, problem solve, and build awesome things together.

+

I'm working open because it's the way decentralisation works. People help, learn, problem solve, and build awesome things together.

Fork me on GitHub From 31cb6d3fb25e2aba47315291e142357bcc992de1 Mon Sep 17 00:00:00 2001 From: David Ross Date: Tue, 27 Sep 2016 16:51:21 +0100 Subject: [PATCH 08/25] removing <<<<< HEAD --- index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/index.html b/index.html index 14da916..59e2ffe 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,3 @@ -<<<<<<< HEAD - From eb4a9484f83303bb4da58c05336ff43988592820 Mon Sep 17 00:00:00 2001 From: David Ross Date: Tue, 27 Sep 2016 16:57:53 +0100 Subject: [PATCH 09/25] fixing merge --- index.html | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/index.html b/index.html index 59e2ffe..0dd49a9 100644 --- a/index.html +++ b/index.html @@ -1,8 +1,10 @@ + + - Ghost + decen.tech @@ -93,7 +95,11 @@

Just a blogging platform.

Welcome to Ghost

-

You're live! Nice. We've put together a little post to introduce you to the Ghost editor and get you started. You can manage your content by »

+ Hello World.. +
+

we're still a work in progress. Be sure to check out the Github repo and Code of Conduct for more info.

+

Uniting open source decentralised projects and helping them engage the wider community.
By providing regular streamed and in person meetups, we seek to educate, overview, and workshop
to build personal skills and drive active contributors to these ground breaking technologies.

+

I'm working open because it's the way decentralisation works. People help, learn, problem solve, and build awesome things together.