From 474cd1a861e90c407fa424226e8ea932d76e5785 Mon Sep 17 00:00:00 2001 From: Joaquin Date: Sun, 23 Nov 2014 22:39:21 -0300 Subject: [PATCH 1/5] a --- Teams/Esquilax/team.json | 36 ++++++++++++++++++++++++++++++++++++ Teams/Esquilax/team.json~ | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 Teams/Esquilax/team.json create mode 100644 Teams/Esquilax/team.json~ diff --git a/Teams/Esquilax/team.json b/Teams/Esquilax/team.json new file mode 100644 index 0000000..f0b1bab --- /dev/null +++ b/Teams/Esquilax/team.json @@ -0,0 +1,36 @@ +{ + "teamName": "Esquilax", + "members": [ + { + "name": "Joaquin Hernan Lavera", + "twitter": "@jhlavera", + "koding": "jlavera", + "location": "Buenos Aires, AR", + "lead": true + }, + { + "name": "Juan Martin Desimoni", + "twitter": "@JuanDesi", + "koding": "JuanDesi", + "location": "Buenos Aires, AR" + }, + { + "name": "Tomas Duhourq", + "twitter": "@tomduhourq", + "koding": "", + "location": "Buenos Aires, AR" + }, + { + "name": "Martin Cousido", + "twitter": "", + "koding": "", + "location": "Buenos Aires, AR" + }, + { + "name": "Manuel Gambino", + "twitter": "@manugb93", + "koding": "", + "location": "Buenos Aires, AR" + } + ] +} diff --git a/Teams/Esquilax/team.json~ b/Teams/Esquilax/team.json~ new file mode 100644 index 0000000..f0b1bab --- /dev/null +++ b/Teams/Esquilax/team.json~ @@ -0,0 +1,36 @@ +{ + "teamName": "Esquilax", + "members": [ + { + "name": "Joaquin Hernan Lavera", + "twitter": "@jhlavera", + "koding": "jlavera", + "location": "Buenos Aires, AR", + "lead": true + }, + { + "name": "Juan Martin Desimoni", + "twitter": "@JuanDesi", + "koding": "JuanDesi", + "location": "Buenos Aires, AR" + }, + { + "name": "Tomas Duhourq", + "twitter": "@tomduhourq", + "koding": "", + "location": "Buenos Aires, AR" + }, + { + "name": "Martin Cousido", + "twitter": "", + "koding": "", + "location": "Buenos Aires, AR" + }, + { + "name": "Manuel Gambino", + "twitter": "@manugb93", + "koding": "", + "location": "Buenos Aires, AR" + } + ] +} From a69aba1da05aeb28600ee999fc657d0a642c6540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20Hern=C3=A1n=20Lavera?= Date: Tue, 25 Nov 2014 12:29:08 -0300 Subject: [PATCH 2/5] Update team.json --- Teams/Esquilax/team.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Teams/Esquilax/team.json b/Teams/Esquilax/team.json index f0b1bab..7f827fe 100644 --- a/Teams/Esquilax/team.json +++ b/Teams/Esquilax/team.json @@ -29,7 +29,7 @@ { "name": "Manuel Gambino", "twitter": "@manugb93", - "koding": "", + "koding": "manugb", "location": "Buenos Aires, AR" } ] From 142bb3718d2466177da3bf908651d9bf311a413f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20Hern=C3=A1n=20Lavera?= Date: Tue, 25 Nov 2014 14:39:43 -0300 Subject: [PATCH 3/5] Update team.json --- Teams/Esquilax/team.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Teams/Esquilax/team.json b/Teams/Esquilax/team.json index 7f827fe..9c56599 100644 --- a/Teams/Esquilax/team.json +++ b/Teams/Esquilax/team.json @@ -22,8 +22,8 @@ }, { "name": "Martin Cousido", - "twitter": "", - "koding": "", + "twitter": "@martucousido", + "koding": "martincousido", "location": "Buenos Aires, AR" }, { From 8545503c74b2346e901037fb10bd553000a96843 Mon Sep 17 00:00:00 2001 From: Joaquin Date: Wed, 26 Nov 2014 19:40:29 -0300 Subject: [PATCH 4/5] asd --- Teams/Esquilax/team.json~ | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 Teams/Esquilax/team.json~ diff --git a/Teams/Esquilax/team.json~ b/Teams/Esquilax/team.json~ deleted file mode 100644 index f0b1bab..0000000 --- a/Teams/Esquilax/team.json~ +++ /dev/null @@ -1,36 +0,0 @@ -{ - "teamName": "Esquilax", - "members": [ - { - "name": "Joaquin Hernan Lavera", - "twitter": "@jhlavera", - "koding": "jlavera", - "location": "Buenos Aires, AR", - "lead": true - }, - { - "name": "Juan Martin Desimoni", - "twitter": "@JuanDesi", - "koding": "JuanDesi", - "location": "Buenos Aires, AR" - }, - { - "name": "Tomas Duhourq", - "twitter": "@tomduhourq", - "koding": "", - "location": "Buenos Aires, AR" - }, - { - "name": "Martin Cousido", - "twitter": "", - "koding": "", - "location": "Buenos Aires, AR" - }, - { - "name": "Manuel Gambino", - "twitter": "@manugb93", - "koding": "", - "location": "Buenos Aires, AR" - } - ] -} From f7fb719c20d9adfbf4224c71b3e36a01ba0f523f Mon Sep 17 00:00:00 2001 From: Joaquin Date: Wed, 26 Nov 2014 19:42:47 -0300 Subject: [PATCH 5/5] clean --- Teams/Esquilax/ABOUT.md | 16 ++++++++++++++++ Teams/Esquilax/ABOUT.md~ | 20 ++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 Teams/Esquilax/ABOUT.md create mode 100644 Teams/Esquilax/ABOUT.md~ diff --git a/Teams/Esquilax/ABOUT.md b/Teams/Esquilax/ABOUT.md new file mode 100644 index 0000000..cc61a9c --- /dev/null +++ b/Teams/Esquilax/ABOUT.md @@ -0,0 +1,16 @@ +This is our page +================ + +Coming soon... + + +About our team +=========================== + +Coming soon... + + +About our skills and what we are going to do? +======= + +We don't know yet! :D diff --git a/Teams/Esquilax/ABOUT.md~ b/Teams/Esquilax/ABOUT.md~ new file mode 100644 index 0000000..9c37233 --- /dev/null +++ b/Teams/Esquilax/ABOUT.md~ @@ -0,0 +1,20 @@ +This is our page +================ + +Coming soon... + + +About our team +=========================== + +Coming soon... + + +About our skills and what we are going to do? +======= +- PHP +- CSS3 +- HTML5 +- Creativity! + +