Commit graph

84 commits

Author SHA1 Message Date
Shel R
ac2515e096 Merge branch 'master' into patch-1 2017-04-07 21:34:41 -04:00
Ray Alez
5b2be91d40 Add HackerNewsBot
I have created a bot that will post Hacker News stories with 100+ points. Adding it to the list.
2017-04-07 15:56:02 -07:00
Jantso Porali
fb0ce9d38d Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
VirtuBox
4564e512e7 Merge branch 'master' into patch-1 2017-04-06 19:11:39 +02:00
shel
fd0096f899 Correct innacurate info and other fixes
This guide was pretty out of date and also contained outright errors which were never true. I have updated it.
2017-04-05 10:58:41 -04:00
VirtuBox
8a360d4292 Update List-of-Mastodon-instances.md 2017-04-05 16:02:47 +02:00
Eugen
437bc1880b Merge pull request #940 from fahy/patch-1
Adding mastodon.irish
2017-04-05 15:24:52 +02:00
Eugen
676763dbc8 Merge pull request #930 from nicobz25/patch-1
Update List-of-Mastodon-instances.md
2017-04-05 15:24:40 +02:00
Padraig Fahy
9efa03d2be Adding mastodon.irish 2017-04-05 14:00:35 +01:00
Eugen
3a39a67901 Merge pull request #938 from wxcafe/patch-3
Updates description for `social.wxcafe.net`
2017-04-05 14:57:38 +02:00
wxcafé
37bd8d45ed Update List-of-Mastodon-instances.md 2017-04-05 14:21:45 +02:00
Cédric Levieux
06d3e7dbba Typography on partY 2017-04-05 13:19:34 +02:00
nicobz25
6ea25d695a Update List-of-Mastodon-instances.md
Add our mastodon instance :) Thanks !
2017-04-05 13:13:09 +02:00
Eugen
7395c62367 Merge pull request #923 from jguerder/patch-1
Added mastodon.cx
2017-04-05 12:33:02 +02:00
Eugen
dd4cec6699 Merge pull request #925 from Angristan/patch-6
Add mstdn.io
2017-04-05 12:26:17 +02:00
Cédric Levieux
9e06446d65 Add mastodon.partipirate.org 2017-04-05 11:24:21 +02:00
Angristan
17fb783672 Add mstdn.io 2017-04-05 11:16:56 +02:00
Jordan Guerder
3a98afd3e9 Added mastodon.cx 2017-04-05 10:52:56 +02:00
Eugen
3975f92b8d Merge branch 'master' into master 2017-04-05 10:29:52 +02:00
Eugen
f8fd1e8a29 Merge pull request #901 from ashfurrow/patch-3
Adds mastodon.technology instance
2017-04-05 10:29:14 +02:00
Eugen
4d46908556 Merge pull request #911 from IMcD23/patch-1
Added mastodon.network instance.
2017-04-05 10:28:58 +02:00
Ian McDowell
628dfbb363 Update List-of-Mastodon-instances.md
Added mastodon.network.
2017-04-04 23:43:57 -05:00
scriptjunkie
940dedab78 Add https://securitymastod.one/ 2017-04-04 23:23:15 -05:00
shel
b6a6a0d3d9 Corrected misinformation regarding Direct Posts
Unless something changed recently I have no clue why this said that direct posts do not federate because they do.
2017-04-04 21:47:13 -04:00
Ash Furrow
026dafe912 Adds mastodon.technology 2017-04-04 21:35:45 -04:00
Eugen
cb1617245b Merge branch 'master' into patch-1 2017-04-05 03:20:37 +02:00
Eugen
49cd7f7fc4 Merge branch 'master' into patch-1 2017-04-05 03:19:14 +02:00
Eugen
4390ae7bf9 Merge branch 'master' into patch-1 2017-04-05 03:18:42 +02:00
Eugen
7603a1d5d2 Merge pull request #846 from TrollDecker/master
Update social.diskseven.com's IPv6 status
2017-04-05 03:08:59 +02:00
Eugen
9c47a07dfa Merge pull request #845 from thurloat/patch-1
Add mastodon.club to running instances list
2017-04-05 03:07:59 +02:00
Eugen
3340074137 Merge pull request #848 from ProgVal/patch-3
Add oc.todon.fr to the list of instances.
2017-04-05 03:07:46 +02:00
Jason Snell
1771eea458 Adding https://mastodon.cc 2017-04-04 16:35:57 -07:00
Pierre Ozoux
ecbda73b27 Update the list of instances 2017-04-04 17:28:29 +01:00
Valentin Lorentz
3187e1b398 Add oc.todon.fr to the list of instances.
[SKIP CI]
2017-04-04 18:11:41 +02:00
Sébastien Santoro
8db8132504 Add social.nasqueron.org instance 2017-04-04 18:11:14 +02:00
Jo Decker
f9c2d86945 Update social.diskseven.com's IPv6 status
As far as I'm aware, my instance should be supporting IPv6 now. Was an error on my part that it wasn't working before.
2017-04-04 15:29:07 +01:00
Adam Thurlow
acc597fa98 Add mastodon.club to running instances list 2017-04-04 11:14:51 -03:00
Florian Maunier
53b2df62dd Update List-of-Mastodon-instances.md
Add my own instance
2017-04-04 16:03:05 +02:00
Eugen
db5149b963 Merge branch 'master' into patch-1 2017-04-04 14:51:42 +02:00
Eugen
7f543e1fca Merge pull request #800 from unascribed/patch-1
Add fern.surgeplay.com to the instances list
2017-04-04 14:51:01 +02:00
Eugen
180aab6e2e Merge pull request #799 from Wonderfall/master
update social.targaryen.house info
2017-04-04 14:50:35 +02:00
Eugen
b9c1c5bdd0 Merge pull request #788 from yiskah/patch-5
Add instances from instances.mastodon.xyz
2017-04-04 14:49:48 +02:00
Leo Wzukw
cb21bf5b40 More consistent typography 2017-04-04 06:58:17 +02:00
Alice
c2787014e5 Add octodon.social 2017-04-03 23:05:03 +02:00
Aesen
9a4a766ab3 Add fern.surgeplay.com to the instances list
It's hard to tell if this is supposed to be alphabetically sorted or not. I put it after epiktistes since it starts with F - let me know if it should go elsewhere.
2017-04-03 15:52:33 -04:00
Wonderfall
e27807e8e9 update social.targaryen.house info 2017-04-03 21:36:28 +02:00
shel
37863b45a3 Add instances from instances.mastodon.xyz
Updated list with lots of instances that have been added to instances.mastodon.xyz but not this list
2017-04-03 12:28:36 -04:00
wxcafé
5c269d3e0e Adds social.wxcafe.net 2017-04-03 17:32:25 +02:00
shel
fd51b1a2a5 Add social.imirhil.fr 2017-04-02 20:11:28 -04:00
Eugen
97a75cc942 Merge pull request #744 from fpiesche/master
Add in-depth user guide
2017-04-03 00:26:24 +02:00