From af9d36d1cdde533ae04c21cd321152a822cf5189 Mon Sep 17 00:00:00 2001 From: meaz Date: Wed, 1 Jan 2020 11:18:44 +0100 Subject: [PATCH 1/2] Add openpgp address + fingerprint for gpg key --- pages/04.contact/_links/2col.de.md | 3 ++- pages/04.contact/_links/2col.en.md | 3 ++- pages/04.contact/_links/2col.es.md | 4 +++- pages/04.contact/_links/2col.fr.md | 5 +++-- pages/04.contact/_links/2col.it.md | 4 +++- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pages/04.contact/_links/2col.de.md b/pages/04.contact/_links/2col.de.md index 30088401..60145198 100644 --- a/pages/04.contact/_links/2col.de.md +++ b/pages/04.contact/_links/2col.de.md @@ -9,7 +9,8 @@ twig_first: false --- [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org -
gpg: https://pgp.key-server.io/0xFA647EDDC576A006 +
gpg: https://pgp.key-server.io/0xC7D900CBF1C89934 or https://keys.openpgp.org/search?q=support%40disroot.org +
fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 [![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot diff --git a/pages/04.contact/_links/2col.en.md b/pages/04.contact/_links/2col.en.md index 676f58f9..62a4e82f 100644 --- a/pages/04.contact/_links/2col.en.md +++ b/pages/04.contact/_links/2col.en.md @@ -9,7 +9,8 @@ twig_first: false --- [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org -gpg: https://pgp.key-server.io/0xFA647EDDC576A006 +
gpg: https://pgp.key-server.io/0xC7D900CBF1C89934 or https://keys.openpgp.org/search?q=support%40disroot.org +
fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 [![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot diff --git a/pages/04.contact/_links/2col.es.md b/pages/04.contact/_links/2col.es.md index 8abb13dd..2558f41e 100644 --- a/pages/04.contact/_links/2col.es.md +++ b/pages/04.contact/_links/2col.es.md @@ -8,7 +8,9 @@ process: twig_first: false --- -[![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org
gpg: https://pgp.key-server.io/0xFA647EDDC576A006 +[![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org +
gpg: https://pgp.key-server.io/0xC7D900CBF1C89934 or https://keys.openpgp.org/search?q=support%40disroot.org +
fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 [![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot diff --git a/pages/04.contact/_links/2col.fr.md b/pages/04.contact/_links/2col.fr.md index 736926e8..be8e1444 100644 --- a/pages/04.contact/_links/2col.fr.md +++ b/pages/04.contact/_links/2col.fr.md @@ -8,13 +8,14 @@ process: twig_first: false --- -[![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org
gpg: https://pgp.key-server.io/0xFA647EDDC576A006 +[![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org +
gpg: https://pgp.key-server.io/0xC7D900CBF1C89934 or https://keys.openpgp.org/search?q=support%40disroot.org +
fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 [![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot [![](hubzilla.png?classes=contact)](https://hub.disroot.org/channel/disroot) Hubzilla: https://hub.disroot.org/channel/disroot - --- ![](irc.png?classes=contact) IRC: #disroot sur irc.freenode.net diff --git a/pages/04.contact/_links/2col.it.md b/pages/04.contact/_links/2col.it.md index 793d0af6..11fcb0be 100644 --- a/pages/04.contact/_links/2col.it.md +++ b/pages/04.contact/_links/2col.it.md @@ -8,7 +8,9 @@ process: twig_first: false --- -[![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org
gpg: https://pgp.key-server.io/0xFA647EDDC576A006 +[![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org +
gpg: https://pgp.key-server.io/0xC7D900CBF1C89934 or https://keys.openpgp.org/search?q=support%40disroot.org +
fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 [![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot From fb0238ddbb9e24854ada4f6ceecf68358612b0d3 Mon Sep 17 00:00:00 2001 From: meaz Date: Wed, 1 Jan 2020 11:25:09 +0100 Subject: [PATCH 2/2] remove br tag (double with auto_line_breaks in grav) --- pages/04.contact/_links/2col.de.md | 4 ++-- pages/04.contact/_links/2col.en.md | 4 ++-- pages/04.contact/_links/2col.es.md | 4 ++-- pages/04.contact/_links/2col.fr.md | 4 ++-- pages/04.contact/_links/2col.it.md | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pages/04.contact/_links/2col.de.md b/pages/04.contact/_links/2col.de.md index 60145198..503d0bea 100644 --- a/pages/04.contact/_links/2col.de.md +++ b/pages/04.contact/_links/2col.de.md @@ -9,8 +9,8 @@ twig_first: false --- [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org -
gpg: https://pgp.key-server.io/0xC7D900CBF1C89934 or https://keys.openpgp.org/search?q=support%40disroot.org -
fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 +gpg: https://pgp.key-server.io/0xC7D900CBF1C89934 or https://keys.openpgp.org/search?q=support%40disroot.org +fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 [![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot diff --git a/pages/04.contact/_links/2col.en.md b/pages/04.contact/_links/2col.en.md index 62a4e82f..ddc5ab95 100644 --- a/pages/04.contact/_links/2col.en.md +++ b/pages/04.contact/_links/2col.en.md @@ -9,8 +9,8 @@ twig_first: false --- [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org -
gpg: https://pgp.key-server.io/0xC7D900CBF1C89934 or https://keys.openpgp.org/search?q=support%40disroot.org -
fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 +gpg: https://pgp.key-server.io/0xC7D900CBF1C89934 or https://keys.openpgp.org/search?q=support%40disroot.org +fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 [![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot diff --git a/pages/04.contact/_links/2col.es.md b/pages/04.contact/_links/2col.es.md index 2558f41e..c05bb35e 100644 --- a/pages/04.contact/_links/2col.es.md +++ b/pages/04.contact/_links/2col.es.md @@ -9,8 +9,8 @@ twig_first: false --- [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org -
gpg: https://pgp.key-server.io/0xC7D900CBF1C89934 or https://keys.openpgp.org/search?q=support%40disroot.org -
fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 +gpg: https://pgp.key-server.io/0xC7D900CBF1C89934 or https://keys.openpgp.org/search?q=support%40disroot.org +fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 [![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot diff --git a/pages/04.contact/_links/2col.fr.md b/pages/04.contact/_links/2col.fr.md index be8e1444..01ab8036 100644 --- a/pages/04.contact/_links/2col.fr.md +++ b/pages/04.contact/_links/2col.fr.md @@ -9,8 +9,8 @@ twig_first: false --- [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org -
gpg: https://pgp.key-server.io/0xC7D900CBF1C89934 or https://keys.openpgp.org/search?q=support%40disroot.org -
fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 +gpg: https://pgp.key-server.io/0xC7D900CBF1C89934 or https://keys.openpgp.org/search?q=support%40disroot.org +fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 [![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot diff --git a/pages/04.contact/_links/2col.it.md b/pages/04.contact/_links/2col.it.md index 11fcb0be..bf320352 100644 --- a/pages/04.contact/_links/2col.it.md +++ b/pages/04.contact/_links/2col.it.md @@ -9,8 +9,8 @@ twig_first: false --- [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org -
gpg: https://pgp.key-server.io/0xC7D900CBF1C89934 or https://keys.openpgp.org/search?q=support%40disroot.org -
fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 +gpg: https://pgp.key-server.io/0xC7D900CBF1C89934 or https://keys.openpgp.org/search?q=support%40disroot.org +fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 [![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot