75 Commits

Author	SHA1	Message	Date
Shel R	05be34a94b	Merge branch 'master' into master	2017-04-07 22:08:54 -04:00
Shel R	e51b6bba94	Merge branch 'master' into patch-1	2017-04-07 22:05:38 -04:00
Shel R	4c05f0e630	Merge branch 'master' into patch-1	2017-04-07 21:59:21 -04:00
Shel R	7b7bff04df	Merge branch 'master' into master	2017-04-07 21:54:32 -04:00
Shel R	5dfc9854f1	Merge branch 'master' into patch-1	2017-04-07 21:48:19 -04:00
Shel R	6d519e6fd1	Merge branch 'master' into patch-1	2017-04-07 21:44:16 -04:00
Shel R	065defefac	Merge branch 'master' into patch-1	2017-04-07 21:42:10 -04:00
foxiehkins	ac1989d2c0	Update description on good-dragon.com	2017-04-05 17:49:04 +01:00
foxiehkins	32d4b51939	Add good-dragon.com	2017-04-05 17:47:52 +01:00
Thomas Alberola	b38bd58921	Adding masto.raildecake.fr, french instance 🌻🐘	2017-04-05 18:15:39 +02:00
ZiiX	96812a6c79	added instance	2017-04-05 09:05:57 -07:00
Amanda Visconti	a31f5765af	Added digitalhumanities.club instance	2017-04-05 12:04:21 -04:00
Toby Deshane	9cf0b5b255	Add social.bytestemplar.com to instances list	2017-04-05 11:49:36 -04:00
Kody	4de3182dc8	Added im-in.space	2017-04-05 17:00:03 +02:00
Technowix	9a534d1df6	Add niu.moe, cuz it's kawaii	2017-04-05 16:18:52 +02:00
VirtuBox	28fb01c71a	Update List-of-Mastodon-instances.md	2017-04-05 16:02:47 +02:00
Eugen	a371a9e002	Merge pull request #940 from fahy/patch-1 ... Adding mastodon.irish	2017-04-05 15:24:52 +02:00
Eugen	be807ff7bd	Merge pull request #930 from nicobz25/patch-1 ... Update List-of-Mastodon-instances.md	2017-04-05 15:24:40 +02:00
Padraig Fahy	cbcfd92a14	Adding mastodon.irish	2017-04-05 14:00:35 +01: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