Commit graph

75 commits

Author SHA1 Message Date
Shel R
8374ca6182 Merge branch 'master' into master 2017-04-07 22:08:54 -04:00
Shel R
34ce7c6fb9 Merge branch 'master' into patch-1 2017-04-07 22:05:38 -04:00
Shel R
fd94a0bece Merge branch 'master' into patch-1 2017-04-07 21:59:21 -04:00
Shel R
ba611ed3b2 Merge branch 'master' into master 2017-04-07 21:54:32 -04:00
Shel R
f3ee549b28 Merge branch 'master' into patch-1 2017-04-07 21:48:19 -04:00
Shel R
7c7851a45c Merge branch 'master' into patch-1 2017-04-07 21:44:16 -04:00
Shel R
791dcac706 Merge branch 'master' into patch-1 2017-04-07 21:42:10 -04:00
foxiehkins
4e2c148ed6 Update description on good-dragon.com 2017-04-05 17:49:04 +01:00
foxiehkins
46c54a92b2 Add good-dragon.com 2017-04-05 17:47:52 +01:00
Thomas Alberola
6aeaeb8b91 Adding masto.raildecake.fr, french instance 🌻🐘 2017-04-05 18:15:39 +02:00
ZiiX
018e2fc68c added instance 2017-04-05 09:05:57 -07:00
Amanda Visconti
4d226de556 Added digitalhumanities.club instance 2017-04-05 12:04:21 -04:00
Toby Deshane
f150c4923e Add social.bytestemplar.com to instances list 2017-04-05 11:49:36 -04:00
Kody
5c28bc676b Added im-in.space 2017-04-05 17:00:03 +02:00
Technowix
38c548fc27 Add niu.moe, cuz it's kawaii 2017-04-05 16:18:52 +02:00
VirtuBox
ef2fa2f3a8 Update List-of-Mastodon-instances.md 2017-04-05 16:02:47 +02:00
Eugen
5e3df4fb44 Merge pull request #940 from fahy/patch-1
Adding mastodon.irish
2017-04-05 15:24:52 +02:00
Eugen
7e32d74422 Merge pull request #930 from nicobz25/patch-1
Update List-of-Mastodon-instances.md
2017-04-05 15:24:40 +02:00
Padraig Fahy
9bd27e6882 Adding mastodon.irish 2017-04-05 14:00:35 +01:00
Eugen
84930a6fd9 Merge pull request #938 from wxcafe/patch-3
Updates description for `social.wxcafe.net`
2017-04-05 14:57:38 +02:00
wxcafé
018b5e7d09 Update List-of-Mastodon-instances.md 2017-04-05 14:21:45 +02:00
Cédric Levieux
223fdffd15 Typography on partY 2017-04-05 13:19:34 +02:00
nicobz25
3d27b6da3a Update List-of-Mastodon-instances.md
Add our mastodon instance :) Thanks !
2017-04-05 13:13:09 +02:00
Eugen
9bd2fef50e Merge pull request #923 from jguerder/patch-1
Added mastodon.cx
2017-04-05 12:33:02 +02:00
Eugen
60b14ab09c Merge pull request #925 from Angristan/patch-6
Add mstdn.io
2017-04-05 12:26:17 +02:00
Cédric Levieux
e4c0643059 Add mastodon.partipirate.org 2017-04-05 11:24:21 +02:00
Angristan
5b33c53ab9 Add mstdn.io 2017-04-05 11:16:56 +02:00
Jordan Guerder
fa816b16c3 Added mastodon.cx 2017-04-05 10:52:56 +02:00
Eugen
430e7019a4 Merge branch 'master' into master 2017-04-05 10:29:52 +02:00
Eugen
ca1adc114b Merge pull request #901 from ashfurrow/patch-3
Adds mastodon.technology instance
2017-04-05 10:29:14 +02:00
Ian McDowell
7aeff85427 Update List-of-Mastodon-instances.md
Added mastodon.network.
2017-04-04 23:43:57 -05:00
scriptjunkie
a123777873 Add https://securitymastod.one/ 2017-04-04 23:23:15 -05:00
Ash Furrow
417b143dc5 Adds mastodon.technology 2017-04-04 21:35:45 -04:00
Eugen
c87dcd8f45 Merge branch 'master' into patch-1 2017-04-05 03:20:37 +02:00
Eugen
7c6b77955c Merge branch 'master' into patch-1 2017-04-05 03:19:14 +02:00
Eugen
f0304f24c6 Merge branch 'master' into patch-1 2017-04-05 03:18:42 +02:00
Eugen
dc9a9e7366 Merge pull request #846 from TrollDecker/master
Update social.diskseven.com's IPv6 status
2017-04-05 03:08:59 +02:00
Eugen
d30df21d88 Merge pull request #845 from thurloat/patch-1
Add mastodon.club to running instances list
2017-04-05 03:07:59 +02:00
Eugen
e30f10a09b 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
7e300a5e57 Adding https://mastodon.cc 2017-04-04 16:35:57 -07:00
Pierre Ozoux
b777d54db2 Update the list of instances 2017-04-04 17:28:29 +01:00
Valentin Lorentz
cfb9551aca Add oc.todon.fr to the list of instances.
[SKIP CI]
2017-04-04 18:11:41 +02:00
Sébastien Santoro
942d5663a6 Add social.nasqueron.org instance 2017-04-04 18:11:14 +02:00
Jo Decker
36cd3cc4dd 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
e3327c69f1 Add mastodon.club to running instances list 2017-04-04 11:14:51 -03:00
Florian Maunier
9d7588c29a Update List-of-Mastodon-instances.md
Add my own instance
2017-04-04 16:03:05 +02:00
Eugen
97d59985f9 Merge branch 'master' into patch-1 2017-04-04 14:51:42 +02:00
Eugen
08eecf0959 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
d73661496a Merge pull request #799 from Wonderfall/master
update social.targaryen.house info
2017-04-04 14:50:35 +02:00
Alice
243f910f40 Add octodon.social 2017-04-03 23:05:03 +02:00