Merge branch ‘develop’ #10

Merged
6543 merged 19 commits from develop into master 2019-07-14 01:29:25 +00:00
3 changed files with 5 additions and 5 deletions
Showing only changes of commit de29af0cc3 - Show all commits

View File

@ -9,9 +9,7 @@ I'm interested in Linux, Networks, Securety and P2P Solutions.

This page exists for my projects, to inform friends about things and so on.

If you have any questions, don't be afraid to write me an [email]({{< siteurl >}}contact).

You can download the PGP Key [here]({{< siteurl >}}publickey.gpg).
If you have any questions, don't be afraid to write me an [[Contact Info]({{< siteurl >}}contact)].


> *This page exists on the normal [Web](https://mh.obermui.de/), on [IPFS](https://ipfs.io/ipns/QmaepDhCbYaQZ58hEAejPy6BfDg14QurRiU2mTWBzmtJsf/) and on [ZeroNet](http://127.0.0.1:43110/15VuKHSRKpgyGAX87mCHYF2L95vad33SPY/)*

View File

@ -6,6 +6,8 @@ draft = false

**Martin H**

Mail: "MH-Site[a-t]obermui.de"
Mail: "6543[a-t]obermui.de" [PGP Key]({{< siteurl >}}publickey.gpg)

Tox ID: BBA4BC0FF865B31F48C7B4E746961E027F643F826798EE9C2FB9533A9DE1024CAEFA14EA78B9

Diaspora: [6543@ggg.social](diaspora://6543@ggg.social)

View File

@ -6,4 +6,4 @@ draft = false

This is a imprint

look at this: About -> email
look at this: About -> [Contact Info]