From 3a8e3150c78e73dd2a13cb86f4052a297fa9dd71 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 12 Feb 2015 11:33:12 -0200 Subject: Merging contact and about pages --- about.mdwn | 12 +++++++++++- contact.mdwn | 6 ------ 2 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 contact.mdwn diff --git a/about.mdwn b/about.mdwn index f9a0284..916dd28 100644 --- a/about.mdwn +++ b/about.mdwn @@ -1,6 +1,16 @@ [[!meta title="About"]] -This is an one-cyborg-effort based on the work of the broader [FLOSS](https://en.wikipedia.org/wiki/FLOSS) community. All the content is here because it haven't found any other place yet to be sent. It's my brain's downstream wishing to be upstream somewhere or staged content to be sent to existing upstreams. +Contact +------- + +My main contacts are defined by my OpenPGP key: + + 0x66CA01CE2BF2C9B7E8D64E340546823964E39FCA + +Technology +---------- + +This is mixed language and one-cyborg-effort based on the work of the broader [FLOSS](https://en.wikipedia.org/wiki/FLOSS) community. All the content is here because it haven't found any other place yet to be sent. It's my brain's downstream wishing to be upstream somewhere or staged content to be sent to existing upstreams. Currently using [Ikiwiki](http://ikiwiki.info) with [Bootstrap](http://twitter.github.io/bootstrap/): diff --git a/contact.mdwn b/contact.mdwn deleted file mode 100644 index b0f907d..0000000 --- a/contact.mdwn +++ /dev/null @@ -1,6 +0,0 @@ -[[!meta title="Contact"]] - -My main contacts are defined by my OpenPGP key: - - 0x66CA01CE2BF2C9B7E8D64E340546823964E39FCA - -- cgit v1.2.3