Commit graph

89 commits

Author SHA1 Message Date
Shel R
780c512ff5 Merge branch 'master' into patch-1 2017-04-07 22:23:50 -04:00
Shel R
76c073d4fd Merge branch 'master' into master 2017-04-07 22:17:53 -04:00
Shel R
71077a7605 Merge branch 'master' into master 2017-04-07 22:15:55 -04:00
Shel R
0b90a13f45 Merge branch 'master' into patch-1 2017-04-07 22:14:08 -04:00
Shel R
81b63dc586 Merge branch 'master' into master 2017-04-07 22:13:06 -04:00
Shel R
acd9cc8a6d Merge branch 'master' into patch-2 2017-04-07 22:11:24 -04:00
Shel R
7c16bd512c Merge branch 'master' into patch-1 2017-04-07 22:09:55 -04:00
Shel R
fc78bf502e Merge branch 'master' into master 2017-04-07 22:08:54 -04:00
Shel R
fc48d7d27d Merge branch 'master' into patch-1 2017-04-07 22:05:38 -04:00
Shel R
03bc0d99b3 Merge branch 'master' into patch-1 2017-04-07 21:59:21 -04:00
Shel R
8b56cdd949 Merge branch 'master' into master 2017-04-07 21:54:32 -04:00
Shel R
baad719a67 Merge branch 'master' into patch-1 2017-04-07 21:48:19 -04:00
Shel R
c442d045a0 Merge branch 'master' into patch-1 2017-04-07 21:44:16 -04:00
Shel R
db00112413 Merge branch 'master' into patch-1 2017-04-07 21:42:10 -04:00
Nick Gerakines
f42b23c2e2 Added off-the-clock.us to the list of instances 2017-04-05 19:19:44 -04:00
Ninetailed
e2dd644eae Description in instance list for mastodon.ninetailed.uk 2017-04-05 22:35:35 +01:00
Thibaut (Eychics)
e0908be254 Add mastodon.nuzgo.net 2017-04-05 20:45:23 +02:00
ava
d7f33066b7 Update List-of-Mastodon-instances.md 2017-04-05 21:44:13 +03:00
Brad Janke
9999d134dd Adds mtndevelopment 2017-04-05 13:14:27 -05:00
Ben Field
5455080fae Update List-of-Mastodon-instances.md 2017-04-05 18:20:08 +01:00
Christopher Gilbert
d67299887a Add Rich.GOP 2017-04-05 13:05:27 -04:00
foxiehkins
8abe6c0a32 Update description on good-dragon.com 2017-04-05 17:49:04 +01:00
foxiehkins
e22f32e058 Add good-dragon.com 2017-04-05 17:47:52 +01:00
Thomas Alberola
84af4bbe59 Adding masto.raildecake.fr, french instance 🌻🐘 2017-04-05 18:15:39 +02:00
ZiiX
9e99e00b5a added instance 2017-04-05 09:05:57 -07:00
Amanda Visconti
47f8766d70 Added digitalhumanities.club instance 2017-04-05 12:04:21 -04:00
Toby Deshane
59e1298b80 Add social.bytestemplar.com to instances list 2017-04-05 11:49:36 -04:00
Kody
41f34e7412 Added im-in.space 2017-04-05 17:00:03 +02:00
Technowix
d5f05d07d6 Add niu.moe, cuz it's kawaii 2017-04-05 16:18:52 +02:00
VirtuBox
8a360d4292 Update List-of-Mastodon-instances.md 2017-04-05 16:02:47 +02:00
Eugen
437bc1880b Merge pull request #940 from fahy/patch-1
Adding mastodon.irish
2017-04-05 15:24:52 +02:00
Eugen
676763dbc8 Merge pull request #930 from nicobz25/patch-1
Update List-of-Mastodon-instances.md
2017-04-05 15:24:40 +02:00
Padraig Fahy
9efa03d2be Adding mastodon.irish 2017-04-05 14:00:35 +01:00
Eugen
3a39a67901 Merge pull request #938 from wxcafe/patch-3
Updates description for `social.wxcafe.net`
2017-04-05 14:57:38 +02:00
wxcafé
37bd8d45ed Update List-of-Mastodon-instances.md 2017-04-05 14:21:45 +02:00
Cédric Levieux
06d3e7dbba Typography on partY 2017-04-05 13:19:34 +02:00
nicobz25
6ea25d695a Update List-of-Mastodon-instances.md
Add our mastodon instance :) Thanks !
2017-04-05 13:13:09 +02:00
Eugen
7395c62367 Merge pull request #923 from jguerder/patch-1
Added mastodon.cx
2017-04-05 12:33:02 +02:00
Eugen
dd4cec6699 Merge pull request #925 from Angristan/patch-6
Add mstdn.io
2017-04-05 12:26:17 +02:00
Cédric Levieux
9e06446d65 Add mastodon.partipirate.org 2017-04-05 11:24:21 +02:00
Angristan
17fb783672 Add mstdn.io 2017-04-05 11:16:56 +02:00
Jordan Guerder
3a98afd3e9 Added mastodon.cx 2017-04-05 10:52:56 +02:00
Eugen
3975f92b8d Merge branch 'master' into master 2017-04-05 10:29:52 +02:00
Eugen
f8fd1e8a29 Merge pull request #901 from ashfurrow/patch-3
Adds mastodon.technology instance
2017-04-05 10:29:14 +02:00
Ian McDowell
628dfbb363 Update List-of-Mastodon-instances.md
Added mastodon.network.
2017-04-04 23:43:57 -05:00
scriptjunkie
940dedab78 Add https://securitymastod.one/ 2017-04-04 23:23:15 -05:00
Ash Furrow
026dafe912 Adds mastodon.technology 2017-04-04 21:35:45 -04:00
Eugen
cb1617245b Merge branch 'master' into patch-1 2017-04-05 03:20:37 +02:00
Eugen
49cd7f7fc4 Merge branch 'master' into patch-1 2017-04-05 03:19:14 +02:00
Eugen
4390ae7bf9 Merge branch 'master' into patch-1 2017-04-05 03:18:42 +02:00