93 Commits

Author	SHA1	Message	Date
Shel R	cf03634e74	Merge branch 'master' into add-elao-com-instance	2017-04-07 22:34:45 -04:00
Shel R	d7d165db5b	Merge branch 'master' into add-infinimatix.net-instance	2017-04-07 22:33:40 -04:00
Shel R	7632178300	Merge branch 'master' into patch-1	2017-04-07 22:23:50 -04:00
Shel R	3e8c1a1c36	Merge branch 'master' into master	2017-04-07 22:17:53 -04:00
Shel R	1b42f717f2	Merge branch 'master' into master	2017-04-07 22:15:55 -04:00
Shel R	9981972844	Merge branch 'master' into patch-1	2017-04-07 22:14:08 -04:00
Shel R	cf13c97cb2	Merge branch 'master' into master	2017-04-07 22:13:06 -04:00
Shel R	451b7431c9	Merge branch 'master' into patch-2	2017-04-07 22:11:24 -04:00
Shel R	6efaee30b1	Merge branch 'master' into patch-1	2017-04-07 22:09:55 -04:00
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
Guewen FAIVRE	83530f0eef	Add mastodon.elao.com instance	2017-04-06 08:46:16 +02:00
Derek Lewis	73b8e67f4b	Add infinimatix.net to instance list	2017-04-06 01:15:16 -04:00
Nick Gerakines	d025c5e593	Added off-the-clock.us to the list of instances	2017-04-05 19:19:44 -04:00
Ninetailed	7aede8e720	Description in instance list for mastodon.ninetailed.uk	2017-04-05 22:35:35 +01:00
Thibaut (Eychics)	eb98c99924	Add mastodon.nuzgo.net	2017-04-05 20:45:23 +02:00
ava	6b41fb2e6f	Update List-of-Mastodon-instances.md	2017-04-05 21:44:13 +03:00
Brad Janke	65b3a2a5a6	Adds mtndevelopment	2017-04-05 13:14:27 -05:00
Ben Field	8fa8004a2b	Update List-of-Mastodon-instances.md	2017-04-05 18:20:08 +01:00
Christopher Gilbert	e5566ac6a6	Add Rich.GOP	2017-04-05 13:05:27 -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