100 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
Shel R	bc237d17a7	Merge branch 'master' into patch-1	2017-04-07 21:34:41 -04:00
Ray Alez	f113af5350	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
foxiehkins	41396de7a9	Merge branch 'master' into master	2017-04-07 14:01:20 +01:00
Jantso Porali	786e6f94b9	Update Finnish translations, add sample Minio config (#954)	2017-04-07 12:58:12 +02:00
VirtuBox	c441208e29	Merge branch 'master' into patch-1	2017-04-06 19:11:39 +02: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
shel	ee758551d1	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
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
Eugen	18d0e817dd	Merge pull request #911 from IMcD23/patch-1 ... Added mastodon.network instance.	2017-04-05 10:28:58 +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
shel	7d354cc8c5	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	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