From 32eee91ff6b6721aa420a637f69983d20c458a94 Mon Sep 17 00:00:00 2001 From: Elena ``of Valhalla'' Grandi Date: Fri, 26 Oct 2018 22:35:53 +0200 Subject: Socializzare: ulteriori gatti --- federazione/slides/img/Cat_and_guinea_pigs.jpg | Bin 0 -> 357431 bytes .../slides/socializzare_nella_federazione.rst | 31 ++++++++++++++------- 2 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 federazione/slides/img/Cat_and_guinea_pigs.jpg diff --git a/federazione/slides/img/Cat_and_guinea_pigs.jpg b/federazione/slides/img/Cat_and_guinea_pigs.jpg new file mode 100644 index 0000000..ed5ef2d Binary files /dev/null and b/federazione/slides/img/Cat_and_guinea_pigs.jpg differ diff --git a/federazione/slides/socializzare_nella_federazione.rst b/federazione/slides/socializzare_nella_federazione.rst index 6a7c624..177b52c 100644 --- a/federazione/slides/socializzare_nella_federazione.rst +++ b/federazione/slides/socializzare_nella_federazione.rst @@ -45,16 +45,17 @@ Strumenti classici * Feed RSS * Chat (XMPP) -Social Network Federati ------------------------ - -+------------+------------+------------+------------+ -| Mastodon | Pleroma | Friendica | Diaspora | -+------------+------------+------------+------------+ -| Hubzilla | Pump.io | GNU Social | Movim | -+------------+------------+------------+------------+ -| PeerTube | Osada | Socialhome | ... | -+------------+------------+------------+------------+ +.. + Social Network Federati + ----------------------- + + +------------+------------+------------+------------+ + | Mastodon | Pleroma | Friendica | Diaspora | + +------------+------------+------------+------------+ + | Hubzilla | Pump.io | GNU Social | Movim | + +------------+------------+------------+------------+ + | PeerTube | Osada | Socialhome | ... | + +------------+------------+------------+------------+ La Federazione -------------- @@ -87,6 +88,11 @@ CatsOfMastodon Summer of ActivityPub --------------------- +* PeerTube +* write.as +* pixelfed +* Plume + Mi avete convinto ----------------- @@ -97,6 +103,11 @@ Mi avete convinto Community Hosting ----------------- +.. image:: img/Cat_and_guinea_pigs.jpg + :align: center + +https://commons.wikimedia.org/wiki/File:Cat_and_guinea_pigs.jpg + Questions? ---------- -- cgit v1.2.3