From 28fb01c71aea96e66bc639917206f5472ca2d34f Mon Sep 17 00:00:00 2001
From: VirtuBox <contact@virtubox.net>
Date: Wed, 5 Apr 2017 16:02:47 +0200
Subject: Update List-of-Mastodon-instances.md

---
 docs/Using-Mastodon/List-of-Mastodon-instances.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/Using-Mastodon')

diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 1f5be3a61..e0bb3d368 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [mastodon.cc](https://mastodon.cc)|Art|Yes|No|
 | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No|
 | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No|
+| [mastodon.top](https://mastodon.top) |N/A|Yes|Yes|
 
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).
-- 
cgit 


From 9a534d1df639ccd462d0c1f0b2faee0734daab8d Mon Sep 17 00:00:00 2001
From: Technowix <Technowix@users.noreply.github.com>
Date: Wed, 5 Apr 2017 16:18:52 +0200
Subject: Add niu.moe, cuz it's kawaii

---
 docs/Using-Mastodon/List-of-Mastodon-instances.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/Using-Mastodon')

diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 1f5be3a61..2918db8e8 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [mastodon.cc](https://mastodon.cc)|Art|Yes|No|
 | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No|
 | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No|
+| [niu.moe](https://niu.moe/)|:dolls: The most cutest node ever, FR/EN, anime and computer :balloon:|Yes|Yes|
 
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).
-- 
cgit 


From 4de3182dc8dbd596785f2e77e3df939be1fc4962 Mon Sep 17 00:00:00 2001
From: Kody <im@kdy.ch>
Date: Wed, 5 Apr 2017 17:00:03 +0200
Subject: Added im-in.space

---
 docs/Using-Mastodon/List-of-Mastodon-instances.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/Using-Mastodon')

diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 1f5be3a61..8b5fa27ea 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [mastodon.cc](https://mastodon.cc)|Art|Yes|No|
 | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No|
 | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No|
+| [im-in.space](https://im-in.space/)|SPAAAAACE! Probably with a lot of French people. (Invite-only, might randomly open registrations)|No|Yes|
 
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).
-- 
cgit 


From 9cf0b5b2557a6e26542a39c3fb31f46a15073662 Mon Sep 17 00:00:00 2001
From: Toby Deshane <Fortyseven@users.noreply.github.com>
Date: Wed, 5 Apr 2017 11:49:36 -0400
Subject: Add social.bytestemplar.com to instances list

---
 docs/Using-Mastodon/List-of-Mastodon-instances.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/Using-Mastodon')

diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 1f5be3a61..a99598eaf 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [mastodon.cc](https://mastodon.cc)|Art|Yes|No|
 | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No|
 | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No|
+| [social.bytestemplar.com](https://social.bytestemplar.com)|N/A|Yes|No|
 
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).
-- 
cgit 


From a31f5765afb2598937b418cce0b5bacdf71c5ba8 Mon Sep 17 00:00:00 2001
From: Amanda Visconti <amandavisconti@users.noreply.github.com>
Date: Wed, 5 Apr 2017 12:04:21 -0400
Subject: Added digitalhumanities.club instance

---
 docs/Using-Mastodon/List-of-Mastodon-instances.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/Using-Mastodon')

diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 1f5be3a61..a295d282b 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [mastodon.cc](https://mastodon.cc)|Art|Yes|No|
 | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No|
 | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No|
+| [digitalhumanities.club](http://www.digitalhumanities.club)|[Digital humanities](http://whatisdigitalhumanities.com) community; invitations will open once code of conduct drafted.|No|No|
 
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).
-- 
cgit 


From 96812a6c792c8b048ed8d4a50351d9696dcf0f77 Mon Sep 17 00:00:00 2001
From: ZiiX <ZiiX@users.noreply.github.com>
Date: Wed, 5 Apr 2017 09:05:57 -0700
Subject: added instance

---
 docs/Using-Mastodon/List-of-Mastodon-instances.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/Using-Mastodon')

diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 1f5be3a61..80fa61ab1 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [mastodon.cc](https://mastodon.cc)|Art|Yes|No|
 | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No|
 | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No|
+| [design.vu](https://design.vu)|— what's your design view‽|Yes|No|
 
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).
-- 
cgit 


From b38bd58921317459ba5bc5cb00a6f18c1875d574 Mon Sep 17 00:00:00 2001
From: Thomas Alberola <thomas@needacoffee.fr>
Date: Wed, 5 Apr 2017 18:15:39 +0200
Subject: Adding masto.raildecake.fr, french instance 🌻🐘
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/Using-Mastodon/List-of-Mastodon-instances.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/Using-Mastodon')

diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 1f5be3a61..23a2867a2 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [mastodon.cc](https://mastodon.cc)|Art|Yes|No|
 | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No|
 | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No|
+| [masto.raildecake.fr](https://masto.raildecake.fr)|Hebergé chez un FAI associatif dans le sud de la france, grillons & pins en options|Yes|No|
 
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).
-- 
cgit 


From 32d4b51939ac8827c2a82191969849b6283b432a Mon Sep 17 00:00:00 2001
From: foxiehkins <foxiehkins@gmail.com>
Date: Wed, 5 Apr 2017 17:47:52 +0100
Subject: Add good-dragon.com

---
 docs/Using-Mastodon/List-of-Mastodon-instances.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/Using-Mastodon')

diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 1f5be3a61..99d019838 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [mastodon.cc](https://mastodon.cc)|Art|Yes|No|
 | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No|
 | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No|
+| [good-dragon.com](https://good-dragon.com/)|Relaxed moderation, Open registrations, Furries, Others also accepted|Yes|No|
 
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).
-- 
cgit 


From ac1989d2c07b707699641987d62697103698393c Mon Sep 17 00:00:00 2001
From: foxiehkins <foxiehkins@gmail.com>
Date: Wed, 5 Apr 2017 17:49:04 +0100
Subject: Update description on good-dragon.com

---
 docs/Using-Mastodon/List-of-Mastodon-instances.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/Using-Mastodon')

diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 99d019838..5ffeecc10 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -48,6 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [mastodon.cc](https://mastodon.cc)|Art|Yes|No|
 | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No|
 | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No|
-| [good-dragon.com](https://good-dragon.com/)|Relaxed moderation, Open registrations, Furries, Others also accepted|Yes|No|
+| [good-dragon.com](https://good-dragon.com/)|Quick updates, Relaxed Moderation, Federates Everywhere, Furries|Yes|No|
 
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).
-- 
cgit 


From e5566ac6a6462c0a8a6c6c8f2a1171087bd662a4 Mon Sep 17 00:00:00 2001
From: Christopher Gilbert <motoma@gmail.com>
Date: Wed, 5 Apr 2017 13:05:27 -0400
Subject: Add Rich.GOP

---
 docs/Using-Mastodon/List-of-Mastodon-instances.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/Using-Mastodon')

diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 1f5be3a61..83b7b8413 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [mastodon.cc](https://mastodon.cc)|Art|Yes|No|
 | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No|
 | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No|
+| [rich.gop](https://rich.gop/)|Federates everywhere, Open registration, Privacy respected|Yes|Yes|
 
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).
-- 
cgit 


From 8fa8004a2b090a3911cce11473bb926ebd6782a6 Mon Sep 17 00:00:00 2001
From: Ben Field <bfield1989@gmail.com>
Date: Wed, 5 Apr 2017 18:20:08 +0100
Subject: Update List-of-Mastodon-instances.md

---
 docs/Using-Mastodon/List-of-Mastodon-instances.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/Using-Mastodon')

diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 1f5be3a61..b4c2b8632 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -48,5 +48,5 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [mastodon.cc](https://mastodon.cc)|Art|Yes|No|
 | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No|
 | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No|
-
+| [social.nowa.re](https://social.nowa.re)|Open Registration|Yes|Not Yet|
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).
-- 
cgit 


From 65b3a2a5a6e3151cf4da89132326b796a5c0687a Mon Sep 17 00:00:00 2001
From: Brad Janke <brad.janke@gmail.com>
Date: Wed, 5 Apr 2017 13:14:27 -0500
Subject: Adds mtndevelopment

---
 docs/Using-Mastodon/List-of-Mastodon-instances.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/Using-Mastodon')

diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 1f5be3a61..28f756bfd 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [mastodon.cc](https://mastodon.cc)|Art|Yes|No|
 | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No|
 | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No|
+| [mastodon.mtndevelopment.com](https://mastodon.mtndevelopment.com/)|Open registration. General nerding out.|Yes|No|
 
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).
-- 
cgit 


From 6b41fb2e6ffa11aa70d14600ad26575bf9aec112 Mon Sep 17 00:00:00 2001
From: ava <vladooku@users.noreply.github.com>
Date: Wed, 5 Apr 2017 21:44:13 +0300
Subject: Update List-of-Mastodon-instances.md

---
 docs/Using-Mastodon/List-of-Mastodon-instances.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/Using-Mastodon')

diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 1f5be3a61..3c72c2c14 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -48,5 +48,5 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [mastodon.cc](https://mastodon.cc)|Art|Yes|No|
 | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No|
 | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No|
-
+| [mastodon.ml](http://mastodon.ml) |A chill place to hangout and chat about anime, programming and movies.|Yes|Yes|
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).
-- 
cgit 


From eb98c99924ab810eea8a97040a82308f68c805cc Mon Sep 17 00:00:00 2001
From: "Thibaut (Eychics)" <thibaut.mathon62@gmail.com>
Date: Wed, 5 Apr 2017 20:45:23 +0200
Subject: Add mastodon.nuzgo.net

---
 docs/Using-Mastodon/List-of-Mastodon-instances.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/Using-Mastodon')

diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 1f5be3a61..26034c368 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -7,6 +7,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | -------------|-------------|---|---|
 | [mastodon.social](https://mastodon.social) |Flagship, quick updates|No|No|
 | [securitymastod.one](https://securitymastod.one/) |Information security enthusiasts and pros|Yes|Yes|
+| [mastodon.nuzgo.net](https://mastodon.nuzgo.net/) |Mastodon instance hosted in Paris |Yes|No|
 | [mastodon.cx](https://mastodon.cx/) |Alternative Mastodon instance hosted in France|Yes|Yes|
 | [mastodon.network](https://mastodon.network) |N/A|Yes|Yes|
 | [awoo.space](https://awoo.space) |Intentionally moderated, only federates with mastodon.social|Yes|No|
-- 
cgit 


From 7aede8e72092fa2b8846f2212dff411247a841b1 Mon Sep 17 00:00:00 2001
From: Ninetailed <ninetailed@gmail.com>
Date: Wed, 5 Apr 2017 22:35:35 +0100
Subject: Description in instance list for mastodon.ninetailed.uk

---
 docs/Using-Mastodon/List-of-Mastodon-instances.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/Using-Mastodon')

diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 1f5be3a61..b6a8c65a9 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -34,7 +34,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [oc.todon.fr](https://oc.todon.fr) |Modérée et principalement francophone, pas de tolérances pour misogynie/LGBTphobies/validisme/etc.|Yes|Yes|
 | [maly.io](https://maly.io) |N/A|Yes|No|
 | [social.lou.lt](https://social.lou.lt) |N/A|Yes|No|
-| [mastodon.ninetailed.uk](https://mastodon.ninetailed.uk) |N/A|Yes|No|
+| [mastodon.ninetailed.uk](https://mastodon.ninetailed.uk) |Open registrations, furry-friendly, UK-based|Yes|No|
 | [soc.louiz.org](https://soc.louiz.org) |"Coucou"|Yes|No|
 | [7nw.eu](https://7nw.eu) |N/A|Yes|No|
 | [mastodon.gougere.fr](https://mastodon.gougere.fr)|N/A|Yes|No|
-- 
cgit 


From d025c5e59306bed05aad4ebc52c541c34cf43d94 Mon Sep 17 00:00:00 2001
From: Nick Gerakines <nick@gerakines.net>
Date: Wed, 5 Apr 2017 19:19:44 -0400
Subject: Added off-the-clock.us to the list of instances

---
 docs/Using-Mastodon/List-of-Mastodon-instances.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/Using-Mastodon')

diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
index 1f5be3a61..5404d6b69 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -48,5 +48,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [mastodon.cc](https://mastodon.cc)|Art|Yes|No|
 | [mastodon.technology](https://mastodon.technology)|Open registrations, federates everywhere, for tech folks|Yes|No|
 | [mastodon.systemlab.fr](https://mastodon.systemlab.fr/)|Le mastodon Français, informatique, jeux-vidéos, gaming et hébergement.|Yes|No|
+| [off-the-clock.us](https://off-the-clock.us/)|The work day is over.|Yes|No|
 
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).
-- 
cgit 


From 786e6f94b986dbf98eae9d79bc75e147fcefc8ec Mon Sep 17 00:00:00 2001
From: Jantso Porali <jantso.porali@gmail.com>
Date: Fri, 7 Apr 2017 12:58:12 +0200
Subject: Update Finnish translations, add sample Minio config (#954)

---
 .env.production.sample                                       | 10 ++++++++++
 app/views/user_mailer/confirmation_instructions.fi.html.erb  |  5 +++++
 app/views/user_mailer/confirmation_instructions.fi.text.erb  |  5 +++++
 app/views/user_mailer/password_change.fi.html.erb            |  3 +++
 app/views/user_mailer/password_change.fi.text.erb            |  3 +++
 .../user_mailer/reset_password_instructions.fi.html.erb      |  8 ++++++++
 .../user_mailer/reset_password_instructions.fi.text.erb      |  8 ++++++++
 config/locales/fi.yml                                        | 12 ++++++------
 docs/Using-Mastodon/FAQ.md                                   |  3 ++-
 9 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 app/views/user_mailer/confirmation_instructions.fi.html.erb
 create mode 100644 app/views/user_mailer/confirmation_instructions.fi.text.erb
 create mode 100644 app/views/user_mailer/password_change.fi.html.erb
 create mode 100644 app/views/user_mailer/password_change.fi.text.erb
 create mode 100644 app/views/user_mailer/reset_password_instructions.fi.html.erb
 create mode 100644 app/views/user_mailer/reset_password_instructions.fi.text.erb

(limited to 'docs/Using-Mastodon')

diff --git a/.env.production.sample b/.env.production.sample
index a7f9eb4bf..a4eabc384 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -44,6 +44,16 @@ SMTP_FROM_ADDRESS=notifications@example.com
 # S3_PROTOCOL=http
 # S3_HOSTNAME=192.168.1.123:9000
 
+# S3 (Minio Config (optional) Please check Minio instance for details)
+# S3_ENABLED=true
+# S3_BUCKET=
+# AWS_ACCESS_KEY_ID=
+# AWS_SECRET_ACCESS_KEY=
+# S3_REGION=
+# S3_PROTOCOL=https
+# S3_HOSTNAME=
+# S3_ENDPOINT=
+
 # Optional alias for S3 if you want to use Cloudfront or Cloudflare in front
 # S3_CLOUDFRONT_HOST=
 
diff --git a/app/views/user_mailer/confirmation_instructions.fi.html.erb b/app/views/user_mailer/confirmation_instructions.fi.html.erb
new file mode 100644
index 000000000..8b72722da
--- /dev/null
+++ b/app/views/user_mailer/confirmation_instructions.fi.html.erb
@@ -0,0 +1,5 @@
+<p>Tervetuloa <%= @resource.email %>!</p>
+
+<p>Voit vahvistaa Mastodon tilisi klikkaamalla alla olevaa linkkiä:</p>
+
+<p><%= link_to 'Varmista tilini', confirmation_url(@resource, confirmation_token: @token) %></p>
diff --git a/app/views/user_mailer/confirmation_instructions.fi.text.erb b/app/views/user_mailer/confirmation_instructions.fi.text.erb
new file mode 100644
index 000000000..796913abb
--- /dev/null
+++ b/app/views/user_mailer/confirmation_instructions.fi.text.erb
@@ -0,0 +1,5 @@
+Tervetuloa <%= @resource.email %>!
+
+Voit vahvistaa Mastodon tilisi klikkaamalla alla olevaa linkkiä:
+
+<%= confirmation_url(@resource, confirmation_token: @token) %>
diff --git a/app/views/user_mailer/password_change.fi.html.erb b/app/views/user_mailer/password_change.fi.html.erb
new file mode 100644
index 000000000..c56b96593
--- /dev/null
+++ b/app/views/user_mailer/password_change.fi.html.erb
@@ -0,0 +1,3 @@
+<p>Hei <%= @resource.email %>!</p>
+
+<p>Lähetämme tämän viestin ilmoittaaksemme että salasanasi on vaihdettu.</p>
diff --git a/app/views/user_mailer/password_change.fi.text.erb b/app/views/user_mailer/password_change.fi.text.erb
new file mode 100644
index 000000000..d90c3fdeb
--- /dev/null
+++ b/app/views/user_mailer/password_change.fi.text.erb
@@ -0,0 +1,3 @@
+Hei <%= @resource.email %>!
+
+Lähetämme tämän viestin ilmoittaaksemme että salasanasi on vaihdettu.
diff --git a/app/views/user_mailer/reset_password_instructions.fi.html.erb b/app/views/user_mailer/reset_password_instructions.fi.html.erb
new file mode 100644
index 000000000..53be0b62b
--- /dev/null
+++ b/app/views/user_mailer/reset_password_instructions.fi.html.erb
@@ -0,0 +1,8 @@
+<p>Hei <%= @resource.email %>!</p>
+
+<p>Joku on pyytänyt salasanvaihto Mastodonissa. Voit tehdä sen allaolevassa linkissä.</p>
+
+<p><%= link_to 'Vaihda salasanani', edit_password_url(@resource, reset_password_token: @token) %></p>
+
+<p>Jos et pyytänyt vaihtoa, poista tämä viesti.</p>
+<p>Salasanaasi ei vaihdeta ennen kuin menet ylläolevaan linkkiin ja luot uuden.</p>
diff --git a/app/views/user_mailer/reset_password_instructions.fi.text.erb b/app/views/user_mailer/reset_password_instructions.fi.text.erb
new file mode 100644
index 000000000..c826d5fc8
--- /dev/null
+++ b/app/views/user_mailer/reset_password_instructions.fi.text.erb
@@ -0,0 +1,8 @@
+Hei <%= @resource.email %>!
+
+Joku on pyytänyt salasanvaihto Mastodonissa. Voit tehdä sen allaolevassa linkissä.
+
+<%= edit_password_url(@resource, reset_password_token: @token) %>
+
+Jos et pyytänyt vaihtoa, poista tämä viesti.
+Salasanaasi ei vaihdeta ennen kuin menet ylläolevaan linkkiin ja luot uuden.
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index cdb2b9886..947d3f646 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -16,18 +16,18 @@ fi:
       chronology: Aikajana on kronologisessa järjestyksessä
       ethics: 'Eettinen suunnittelu: ei mainoksia, no seurantaa'
       gifv: GIFV settejä ja lyhyitä videoita
-      privacy: Julkaisu kohtainen yksityisyys aseuts
+      privacy: Julkaisu kohtainen yksityisyys asetus
       public: Julkiset aikajanat
     features_headline: Mikä erottaa Mastodonin muista
     get_started: Aloita käyttö
     links: Linkit
-    other_instances: muuhun palvelimeen
+    other_instances: Muut palvelimet
     source_code: Lähdekoodi
     status_count_after: statusta
     status_count_before: Ovat luoneet
     terms: Ehdot
-    user_count_after: käyttäjää
-    user_count_before: Koti käyttäjälle
+    user_count_after: käyttäjälle
+    user_count_before: Koti
   accounts:
     follow: Seuraa
     followers: Seuraajat
@@ -130,8 +130,8 @@ fi:
     authorized_apps: Valtuutetut ohjelmat
     back: Takaisin Mastodoniin
     edit_profile: Muokkaa profiilia
-    export: Datan vienti
-    import: Datan tuonti
+    export: Vie dataa
+    import: Tuo dataa
     preferences: Ominaisuudet
     settings: Asetukset
     two_factor_auth: Kaksivaiheinen tunnistus
diff --git a/docs/Using-Mastodon/FAQ.md b/docs/Using-Mastodon/FAQ.md
index daedcbdd8..3b03a8ee4 100644
--- a/docs/Using-Mastodon/FAQ.md
+++ b/docs/Using-Mastodon/FAQ.md
@@ -36,8 +36,9 @@ While Mastodon is compatible with GNU social in terms of server to server commun
 
 Because Mastodon has been created from a blank slate, it is much simpler to have the API mirror internal structures as closely as possible, rather than build an emulation layer. Secondly, the GNU social client API is actually a half-way implementation of the legacy Twitter API - that's the reason why it works with some older Twitter client apps. However, many of those apps are not maintained anymore, the GNU social API does not actually keep up with the real Twitter API and never fully implemented all its features; at the same time, the Twitter API was never meant for a federated service and so obscures some of the functionality.
 
+
 #### How is Mastodon funded?
 
 Development of Mastodon and hosting of mastodon.social is funded through my [Patreon (also BTC/PayPal donations)](https://www.patreon.com/user?u=619786). Beyond that, I am not interested in VC funding, monetizing, advertising, or anything of that sort. I could offer setup/maintenance services on demand.
 
-The software is free and open source and communities should host their own servers if they can, that way the costs are more or less distributed. Obviously it'd be hard for me to pay the bills if literally everyone decided to use the mastodon.social instance only.
\ No newline at end of file
+The software is free and open source and communities should host their own servers if they can, that way the costs are more or less distributed. Obviously it'd be hard for me to pay the bills if literally everyone decided to use the mastodon.social instance only.
-- 
cgit 


From f113af5350a02152e3984edd027e3136bc888244 Mon Sep 17 00:00:00 2001
From: Ray Alez <raymestalez@gmail.com>
Date: Fri, 7 Apr 2017 15:56:02 -0700
Subject: Add HackerNewsBot

I have created a bot that will post Hacker News stories with 100+ points. Adding it to the list.
---
 docs/Using-Mastodon/Apps.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/Using-Mastodon')

diff --git a/docs/Using-Mastodon/Apps.md b/docs/Using-Mastodon/Apps.md
index 67b14dc26..b5e1fa36b 100644
--- a/docs/Using-Mastodon/Apps.md
+++ b/docs/Using-Mastodon/Apps.md
@@ -13,5 +13,6 @@ Some people have started working on apps for the Mastodon API. Here is a list of
 |Albatross|iOS||[@goldie_ice@mastodon.social](https://mastodon.social/users/goldie_ice)|
 |Tooter|Chrome|<https://github.com/ineffyble/tooter>|[@effy@mastodon.social](https://mastodon.social/users/effy)|
 |tootstream|CLI|<https://github.com/magicalraccoon/tootstream>|[@Raccoon@mastodon.social](https://mastodon.social/users/Raccoon)|
+|HackerNewsBot|CLI|<https://github.com/raymestalez/mastodon-hnbot>|[@rayalez@hackertribe.io](https://hackertribe.io/users/rayalez)|
 
 If you have a project like this, let me know so I can add it to the list!
-- 
cgit