57 commits

Author	SHA1	Message	Date
Eugen	be807ff7bd	Merge pull request #930 from nicobz25/patch-1 ... Update List-of-Mastodon-instances.md	2017-04-05 15:24:40 +02:00
Eugen	b45b4865a7	Merge pull request #938 from wxcafe/patch-3 ... Updates description for `social.wxcafe.net`	2017-04-05 14:57:38 +02:00
wxcafé	259e626165	Update List-of-Mastodon-instances.md	2017-04-05 14:21:45 +02:00
Cédric Levieux	85c768bf16	Typography on partY	2017-04-05 13:19:34 +02:00
nicobz25	9572282a55	Update List-of-Mastodon-instances.md ... Add our mastodon instance :) Thanks !	2017-04-05 13:13:09 +02:00
Eugen	f8a5ff95ec	Merge pull request #923 from jguerder/patch-1 ... Added mastodon.cx	2017-04-05 12:33:02 +02:00
Eugen	af0decf597	Merge pull request #925 from Angristan/patch-6 ... Add mstdn.io	2017-04-05 12:26:17 +02:00
Cédric Levieux	bdf3ac95b8	Add mastodon.partipirate.org	2017-04-05 11:24:21 +02:00
Angristan	fa6f7c8898	Add mstdn.io	2017-04-05 11:16:56 +02:00
Jordan Guerder	5963fce131	Added mastodon.cx	2017-04-05 10:52:56 +02:00
Eugen	8b8839978a	Merge branch 'master' into master	2017-04-05 10:29:52 +02:00
Eugen	78cf0fe1c7	Merge pull request #901 from ashfurrow/patch-3 ... Adds mastodon.technology instance	2017-04-05 10:29:14 +02:00
Ian McDowell	8040d1d8ce	Update List-of-Mastodon-instances.md ... Added mastodon.network.	2017-04-04 23:43:57 -05:00
scriptjunkie	29efeecb9e	Add https://securitymastod.one/	2017-04-04 23:23:15 -05:00
Ash Furrow	128dcb2825	Adds mastodon.technology	2017-04-04 21:35:45 -04:00
Eugen	aa464aa0d8	Merge branch 'master' into patch-1	2017-04-05 03:20:37 +02:00
Eugen	78c1e2e958	Merge branch 'master' into patch-1	2017-04-05 03:19:14 +02:00
Eugen	bdaf31bcc9	Merge branch 'master' into patch-1	2017-04-05 03:18:42 +02:00
Eugen	f735efdbc1	Merge pull request #846 from TrollDecker/master ... Update social.diskseven.com's IPv6 status	2017-04-05 03:08:59 +02:00
Eugen	1c634ad21a	Merge pull request #845 from thurloat/patch-1 ... Add mastodon.club to running instances list	2017-04-05 03:07:59 +02:00
Eugen	682c8a6fc8	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	50a88d6a6e	Adding https://mastodon.cc	2017-04-04 16:35:57 -07:00
Pierre Ozoux	41ba74b511	Update the list of instances	2017-04-04 17:28:29 +01:00
Valentin Lorentz	22000ef7a9	Add oc.todon.fr to the list of instances. ... [SKIP CI]	2017-04-04 18:11:41 +02:00
Sébastien Santoro	7015578655	Add social.nasqueron.org instance	2017-04-04 18:11:14 +02:00
Jo Decker	d8855150a0	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	192f079776	Add mastodon.club to running instances list	2017-04-04 11:14:51 -03:00
Florian Maunier	58bdb9b42e	Update List-of-Mastodon-instances.md ... Add my own instance	2017-04-04 16:03:05 +02:00
Eugen	48dfdad492	Merge branch 'master' into patch-1	2017-04-04 14:51:42 +02:00
Eugen	ed4a723a82	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	c359e60034	Merge pull request #799 from Wonderfall/master ... update social.targaryen.house info	2017-04-04 14:50:35 +02:00
Alice	5b6f4fdeb4	Add octodon.social	2017-04-03 23:05:03 +02:00
Aesen	1ed37fae9b	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	cc451e1fcb	update social.targaryen.house info	2017-04-03 21:36:28 +02:00
shel	8a45a97e2e	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é	d06c810b16	Adds social.wxcafe.net	2017-04-03 17:32:25 +02:00
shel	e2526a62e7	Add social.imirhil.fr	2017-04-02 20:11:28 -04:00
Michael Vieira	b69e97c40b	add link to another mastodon instance.	2017-04-03 00:04:54 +02:00
TheKinrar	9f219d8968	Add link to instances.mastodon.xyz	2017-04-02 17:48:25 +02:00
Sina Mashek	aaea7e1e7c	Adding social.mashek.net	2017-04-02 16:22:13 +03:00
Eugen	a2fa09518f	Merge branch 'master' into patch-1	2017-04-02 12:33:29 +02:00
TheKinrar	f5d434e433	Add IPv6 column in list and remove dead instance ... This is done after some complaints I saw on Twitter about the lack of IPv6 support on Mastodon instances. Also, seeing this may encourage instances owner to add IPv6 support to their own.	2017-04-02 12:05:32 +02:00
jenn kaplan	1389d5d7fd	Updated list of instances for gay.crime.team ... Updated out-of-date info for gay.crime.team	2017-04-01 22:37:10 -07:00
Wonderfall	7ccc9b8b02	Add social.targaryen.house to instances list	2017-04-01 23:53:00 +02:00
TheKinrar	355168b939	Add mastodon.xyz to instances list	2017-04-01 18:00:52 +02:00
Alexander Acevedo	851b730373	add social.gestaltzerfall.net instance information ... Hello fediverse!	2017-03-03 19:17:58 -05:00
undrskr	fac8bfc03f	gnusocial.me doesn't use Mastodon anymore ... The host uses postActiv now.	2017-03-03 22:38:10 +02:00
shel	b4a12c88e7	Add social.dickseven.com ... New instance	2017-02-28 13:02:39 -05:00
shel	7a99699e2d	Add memetastic.space ... It's uh, it's an instance now.	2017-02-13 14:37:58 -05:00
Lorenz Diener	73210a93df	Add https://icosahedron.website/	2017-02-13 17:25:21 +01:00