summaryrefslogtreecommitdiff
path: root/federazione
diff options
context:
space:
mode:
authorElena ``of Valhalla'' Grandi <valhalla@trueelena.org>2018-10-26 22:35:53 +0200
committerElena ``of Valhalla'' Grandi <valhalla@trueelena.org>2018-10-26 22:35:53 +0200
commit32eee91ff6b6721aa420a637f69983d20c458a94 (patch)
tree73fc861d41e24cd1a4388ad16564f96908e9240f /federazione
parente3746bd09a3a62ed0744778560d1ac68268cca77 (diff)
Socializzare: ulteriori gatti
Diffstat (limited to 'federazione')
-rw-r--r--federazione/slides/img/Cat_and_guinea_pigs.jpgbin0 -> 357431 bytes
-rw-r--r--federazione/slides/socializzare_nella_federazione.rst31
2 files changed, 21 insertions, 10 deletions
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
--- /dev/null
+++ b/federazione/slides/img/Cat_and_guinea_pigs.jpg
Binary files 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?
----------