From 407990f10d4bd985dc41fd5d57a0b3facdc3d309 Mon Sep 17 00:00:00 2001 From: meaz Date: Tue, 9 Feb 2021 22:40:29 +0100 Subject: [PATCH 1/3] Update contact with new gpg key for cryptdisroot --- pages/04.contact/_links/2col.de.md | 9 ++++++--- pages/04.contact/_links/2col.en.md | 10 +++++++--- pages/04.contact/_links/2col.es.md | 9 ++++++--- pages/04.contact/_links/2col.fr.md | 10 +++++++--- pages/04.contact/_links/2col.it.md | 9 ++++++--- pages/04.contact/_links/2col.ru.md | 8 ++++++-- 6 files changed, 38 insertions(+), 17 deletions(-) diff --git a/pages/04.contact/_links/2col.de.md b/pages/04.contact/_links/2col.de.md index d3efd520..a8a81830 100644 --- a/pages/04.contact/_links/2col.de.md +++ b/pages/04.contact/_links/2col.de.md @@ -9,8 +9,10 @@ twig_first: false --- [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org - - GPG: [keys.openpgp.org](https://keys.openpgp.org/search?q=support%40disroot.org) - - Fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 + +[![](email.png?classes=contact)](mailto:cryptsupport@disroot.org) cryptsupport@disroot.org + - GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index) + - Fingerprint: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8 [![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot @@ -29,5 +31,6 @@ twig_first: false ) NextCloud: https://cloud.disroot.org/call/di5y9zno -All listed chatrooms are bridged together. This means that no matter which chatroom from this list you choose, you will be able to communicate with all the comunity via a chat relay bot. +--- +All listed chatrooms are bridged together. This means that no matter which chatroom from this list you choose, you will be able to communicate with all the comunity via a chat relay bot. diff --git a/pages/04.contact/_links/2col.en.md b/pages/04.contact/_links/2col.en.md index 0b6375ac..89a18b33 100644 --- a/pages/04.contact/_links/2col.en.md +++ b/pages/04.contact/_links/2col.en.md @@ -9,8 +9,10 @@ twig_first: false --- [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org - - GPG: [keys.openpgp.org](https://keys.openpgp.org/search?q=support%40disroot.org) - - Fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 + +[![](email.png?classes=contact)](mailto:cryptsupport@disroot.org) cryptsupport@disroot.org + - GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index) + - Fingerprint: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8 [![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot @@ -28,4 +30,6 @@ twig_first: false [![](nextcloud.png?classes=contact)](https://cloud.disroot.org/call/di5y9zno ) NextCloud: https://cloud.disroot.org/call/di5y9zno -All listed chatrooms are bridged together. This means that no matter which chatroom from this list you choose, you will be able to communicate with all the comunity via a chat relay bot. +--- + +All listed chatrooms are bridged together. This means that no matter which chatroom from this list you choose, you will be able to communicate with all the comunity via a chat relay bot. diff --git a/pages/04.contact/_links/2col.es.md b/pages/04.contact/_links/2col.es.md index a090ca56..0eb4eaf7 100644 --- a/pages/04.contact/_links/2col.es.md +++ b/pages/04.contact/_links/2col.es.md @@ -9,8 +9,10 @@ twig_first: false --- [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org - - GPG: [keys.openpgp.org](https://keys.openpgp.org/search?q=support%40disroot.org) - - Huella digital: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 + +[![](email.png?classes=contact)](mailto:cryptsupport@disroot.org) cryptsupport@disroot.org + - GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index) + - Huella digital: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8 [![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot @@ -28,5 +30,6 @@ twig_first: false ) NextCloud: https://cloud.disroot.org/call/di5y9zno -All listed chatrooms are bridged together. This means that no matter which chatroom from this list you choose, you will be able to communicate with all the comunity via a chat relay bot. +--- +All listed chatrooms are bridged together. This means that no matter which chatroom from this list you choose, you will be able to communicate with all the comunity via a chat relay bot. diff --git a/pages/04.contact/_links/2col.fr.md b/pages/04.contact/_links/2col.fr.md index a2a41c27..1cebe817 100644 --- a/pages/04.contact/_links/2col.fr.md +++ b/pages/04.contact/_links/2col.fr.md @@ -9,8 +9,10 @@ twig_first: false --- [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org - - GPG: [keys.openpgp.org](https://keys.openpgp.org/search?q=support%40disroot.org) - - Empreinte: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 + +[![](email.png?classes=contact)](mailto:cryptsupport@disroot.org) cryptsupport@disroot.org + - GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index) + - Empreinte: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8 [![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot @@ -27,5 +29,7 @@ twig_first: false [![](nextcloud.png?classes=contact)](https://cloud.disroot.org/call/di5y9zno ) NextCloud: https://cloud.disroot.org/call/di5y9zno -All listed chatrooms are bridged together. This means that no matter which chatroom from this list you choose, you will be able to communicate with all the comunity via a chat relay bot. +--- + +Tous les salons de discussion répertoriés sont reliés entre eux. Cela signifie que, quel que soit le salon de discussion que vous choisissez dans cette liste, vous pourrez communiquer avec toute la communauté par l'intermédiaire d'un robot de relais de discussion. diff --git a/pages/04.contact/_links/2col.it.md b/pages/04.contact/_links/2col.it.md index 375ba63f..051b91d5 100644 --- a/pages/04.contact/_links/2col.it.md +++ b/pages/04.contact/_links/2col.it.md @@ -9,8 +9,10 @@ twig_first: false --- [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org - - GPG: [keys.openpgp.org](https://keys.openpgp.org/search?q=support%40disroot.org) - - Fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 + +[![](email.png?classes=contact)](mailto:cryptsupport@disroot.org) cryptsupport@disroot.org + - GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index) + - Fingerprint: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8 [![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot @@ -28,5 +30,6 @@ twig_first: false ) NextCloud: https://cloud.disroot.org/call/di5y9zno -All listed chatrooms are bridged together. This means that no matter which chatroom from this list you choose, you will be able to communicate with all the comunity via a chat relay bot. +--- +All listed chatrooms are bridged together. This means that no matter which chatroom from this list you choose, you will be able to communicate with all the comunity via a chat relay bot. diff --git a/pages/04.contact/_links/2col.ru.md b/pages/04.contact/_links/2col.ru.md index fc89256d..9e3d303a 100644 --- a/pages/04.contact/_links/2col.ru.md +++ b/pages/04.contact/_links/2col.ru.md @@ -9,8 +9,10 @@ twig_first: false --- [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org - - GPG: [keys.openpgp.org](https://keys.openpgp.org/search?q=support%40disroot.org) - - Fingerprint: 8D4F E55F A21B 88DB A094 75FA C7D9 00CB F1C8 9934 + +[![](email.png?classes=contact)](mailto:cryptsupport@disroot.org) cryptsupport@disroot.org + - GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index) + - Fingerprint: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8 [![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot @@ -28,4 +30,6 @@ twig_first: false [![](nextcloud.png?classes=contact)](https://cloud.disroot.org/call/di5y9zno ) NextCloud: https://cloud.disroot.org/call/di5y9zno +--- + Все перечисленные чаты объединены воедино. Это означает, что независимо от того, какой чат из этого списка вы выберете, вы сможете общаться со всем сообществом через бот-ретранслятор. From 9c3f3173677087996f7d1e4f658ea043550ff4ac Mon Sep 17 00:00:00 2001 From: antilopa Date: Fri, 12 Feb 2021 21:09:03 +0100 Subject: [PATCH 2/3] suggestion for better layout --- pages/04.contact/_links/2col.en.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pages/04.contact/_links/2col.en.md b/pages/04.contact/_links/2col.en.md index 89a18b33..9f64eb77 100644 --- a/pages/04.contact/_links/2col.en.md +++ b/pages/04.contact/_links/2col.en.md @@ -10,9 +10,7 @@ twig_first: false [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org -[![](email.png?classes=contact)](mailto:cryptsupport@disroot.org) cryptsupport@disroot.org - - GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index) - - Fingerprint: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8 +[![](email.png?classes=contact,pull-left)](mailto:cryptsupport@disroot.org)

cryptsupport@disroot.org
GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index)
Fingerprint: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8
[![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot From 882ae50c89a425740d4b687932713a632048ed0e Mon Sep 17 00:00:00 2001 From: meaz Date: Sat, 13 Feb 2021 06:10:34 +0100 Subject: [PATCH 3/3] antilopa's suggestion into other language page --- pages/04.contact/_links/2col.de.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 +--- pages/04.contact/_links/2col.ru.md | 4 +--- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/pages/04.contact/_links/2col.de.md b/pages/04.contact/_links/2col.de.md index a8a81830..1413220b 100644 --- a/pages/04.contact/_links/2col.de.md +++ b/pages/04.contact/_links/2col.de.md @@ -10,9 +10,7 @@ twig_first: false [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org -[![](email.png?classes=contact)](mailto:cryptsupport@disroot.org) cryptsupport@disroot.org - - GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index) - - Fingerprint: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8 +[![](email.png?classes=contact,pull-left)](mailto:cryptsupport@disroot.org)

cryptsupport@disroot.org
GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index)
Fingerprint: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8
[![](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 0eb4eaf7..16de8a1a 100644 --- a/pages/04.contact/_links/2col.es.md +++ b/pages/04.contact/_links/2col.es.md @@ -10,9 +10,7 @@ twig_first: false [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org -[![](email.png?classes=contact)](mailto:cryptsupport@disroot.org) cryptsupport@disroot.org - - GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index) - - Huella digital: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8 +[![](email.png?classes=contact,pull-left)](mailto:cryptsupport@disroot.org)

cryptsupport@disroot.org
GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index)
Huella digital: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8
[![](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 1cebe817..cb8a4f06 100644 --- a/pages/04.contact/_links/2col.fr.md +++ b/pages/04.contact/_links/2col.fr.md @@ -10,9 +10,7 @@ twig_first: false [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org -[![](email.png?classes=contact)](mailto:cryptsupport@disroot.org) cryptsupport@disroot.org - - GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index) - - Empreinte: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8 +[![](email.png?classes=contact,pull-left)](mailto:cryptsupport@disroot.org)

cryptsupport@disroot.org
GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index)
Empreinte: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8
[![](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 051b91d5..afcedaf5 100644 --- a/pages/04.contact/_links/2col.it.md +++ b/pages/04.contact/_links/2col.it.md @@ -10,9 +10,7 @@ twig_first: false [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org -[![](email.png?classes=contact)](mailto:cryptsupport@disroot.org) cryptsupport@disroot.org - - GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index) - - Fingerprint: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8 +[![](email.png?classes=contact,pull-left)](mailto:cryptsupport@disroot.org)

cryptsupport@disroot.org
GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index)
Fingerprint: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8
[![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot diff --git a/pages/04.contact/_links/2col.ru.md b/pages/04.contact/_links/2col.ru.md index 9e3d303a..66f73dd8 100644 --- a/pages/04.contact/_links/2col.ru.md +++ b/pages/04.contact/_links/2col.ru.md @@ -10,9 +10,7 @@ twig_first: false [![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org -[![](email.png?classes=contact)](mailto:cryptsupport@disroot.org) cryptsupport@disroot.org - - GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index) - - Fingerprint: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8 +[![](email.png?classes=contact,pull-left)](mailto:cryptsupport@disroot.org)

cryptsupport@disroot.org
GPG: [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index)
Fingerprint: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8
[![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: https://social.weho.st/@disroot