Commit graph

1974 commits

Author SHA1 Message Date
Eugen
22eff0449f Merge pull request #1213 from tootsuite/fix-accounts-initial-case
Fix #801 - Respect webfinger's canonical response of username/domain
2017-04-08 11:36:35 +02:00
Eugen
a98291c382 Merge pull request #1225 from tootsuite/yiskah-patch-1
Close instance list to additions
2017-04-08 11:35:40 +02:00
Shel R
fb23e13cc5 Close instance list to additions 2017-04-07 23:51:30 -04:00
Shel R
435c4d98f6 Merge pull request #1137 from Noiwex/patch-1
Update List-of-Mastodon-instances.md
2017-04-07 23:16:46 -04:00
Shel R
22598c0887 Merge branch 'master' into patch-1 2017-04-07 23:15:17 -04:00
Shel R
68d0ac7e42 Merge pull request #1197 from blakebarnett/add_indigo_zone_instance
Add indigo.zone to list of instances
2017-04-07 23:10:25 -04:00
Shel R
d01f588d77 Merge branch 'master' into add_indigo_zone_instance 2017-04-07 23:09:50 -04:00
Shel R
ef88e00c30 Merge pull request #1196 from mouse-reeve/list-oulipo-social
Adds Oulipo.social to Mastodons list
2017-04-07 23:09:09 -04:00
Shel R
4e9312bba3 Merge branch 'master' into list-oulipo-social 2017-04-07 23:08:41 -04:00
Shel R
dc0c19502b Merge pull request #1186 from Aguay-val/patch-2
Add mastodon.fun
2017-04-07 23:07:50 -04:00
Shel R
a876a87890 Merge branch 'master' into patch-2 2017-04-07 23:05:08 -04:00
Shel R
9397634b9c Merge branch 'master' into patch-1 2017-04-07 23:03:07 -04:00
Shel R
c0d857714d Merge pull request #1107 from YDrogen/patch-1
Added masto.razrnet.fr
2017-04-07 22:54:44 -04:00
Shel R
45f9242902 Merge branch 'master' into patch-1 2017-04-07 22:54:25 -04:00
Shel R
9a408b42cb Merge pull request #1090 from gled-rs/master
Added mastodon.host in the list of instances
2017-04-07 22:54:14 -04:00
Shel R
2d0cf0e690 Merge branch 'master' into master 2017-04-07 22:53:42 -04:00
Shel R
af150540e0 Merge pull request #1085 from isati/patch-2
Add manx.social instance
2017-04-07 22:49:34 -04:00
Shel R
a063083b1a Merge branch 'master' into patch-2 2017-04-07 22:49:14 -04:00
Shel R
23d8d91034 Merge pull request #1084 from genesixx/patch-4
Update List-of-Mastodon-instances.md
2017-04-07 22:48:02 -04:00
Shel R
1969549e50 Merge branch 'master' into patch-4 2017-04-07 22:47:42 -04:00
Shel R
80d7527b4d Merge pull request #1074 from kadiix/patch-1
Add an instance.
2017-04-07 22:47:00 -04:00
Shel R
b3ebd07861 Merge branch 'master' into patch-1 2017-04-07 22:46:36 -04:00
Shel R
7bc26b9e90 Merge pull request #1069 from Awea/master
Add an instance
2017-04-07 22:45:15 -04:00
Shel R
4dc42528b2 Merge branch 'master' into master 2017-04-07 22:44:40 -04:00
Shel R
528980fd32 Merge pull request #1066 from jack-michaud/master
Add Northeastern University Mastodon
2017-04-07 22:43:46 -04:00
Shel R
758cf4ef65 Merge branch 'master' into master 2017-04-07 22:43:13 -04:00
Shel R
8f77841110 Merge pull request #1051 from Tiwy57/patch-1
Add an instance
2017-04-07 22:42:34 -04:00
Shel R
9ab9130d04 Merge branch 'master' into patch-1 2017-04-07 22:42:14 -04:00
Shel R
4b5749f7a2 Merge pull request #1050 from lfuelling/patch-1
add my instance
2017-04-07 22:41:37 -04:00
Shel R
cc9418281b Merge branch 'master' into patch-1 2017-04-07 22:41:07 -04:00
Shel R
5669cc4ab9 Merge pull request #1046 from raymestalez/patch-2
Added an instance to the list
2017-04-07 22:40:29 -04:00
Shel R
9539c90339 Merge branch 'master' into patch-2 2017-04-07 22:39:59 -04:00
Shel R
80ea1c927b Merge pull request #1041 from R0ckweb/patch-1
Update List-of-Mastodon-instances.md
2017-04-07 22:39:05 -04:00
Shel R
c249d9091b Merge branch 'master' into patch-1 2017-04-07 22:38:37 -04:00
Shel R
0de53c268e Merge pull request #1036 from wirehack7/patch-1
Update List-of-Mastodon-instances.md
2017-04-07 22:37:51 -04:00
Shel R
ef6b1aac3a Merge branch 'master' into patch-1 2017-04-07 22:35:45 -04:00
Shel R
af02261359 Merge pull request #1035 from gfaivre/add-elao-com-instance
Add mastodon.elao.com instance
2017-04-07 22:35:08 -04:00
Shel R
ae7f3d9203 Merge branch 'master' into add-elao-com-instance 2017-04-07 22:34:45 -04:00
Shel R
19b4750a47 Merge pull request #1030 from derekcecillewis/add-infinimatix.net-instance
Add infinimatix.net to instance list
2017-04-07 22:34:10 -04:00
Shel R
bc5fb211ca Merge branch 'master' into add-infinimatix.net-instance 2017-04-07 22:33:40 -04:00
Shel R
03cda34cde Merge pull request #1009 from ngerakines/patch-1
Added off-the-clock.us to the list of instances
2017-04-07 22:25:45 -04:00
Shel R
780c512ff5 Merge branch 'master' into patch-1 2017-04-07 22:23:50 -04:00
Shel R
3e8ca58f4c Merge pull request #797 from AndreLewin/master
Added Esperanto translation (eo)
2017-04-07 22:21:48 -04:00
Shel R
3b9a56d4b3 Merge branch 'master' into master 2017-04-07 22:21:21 -04:00
Shel R
a9624f7e11 Merge pull request #1006 from Ninetailed/master
Description in instance list for mastodon.ninetailed.uk
2017-04-07 22:18:11 -04:00
Shel R
76c073d4fd Merge branch 'master' into master 2017-04-07 22:17:53 -04:00
Shel R
762a6592d6 Merge pull request #992 from Eychics/master
Add mastodon.nuzgo.net in instance list
2017-04-07 22:16:49 -04:00
Shel R
71077a7605 Merge branch 'master' into master 2017-04-07 22:15:55 -04:00
Shel R
a49e89df02 Merge pull request #991 from vladooku/patch-1
Update List-of-Mastodon-instances.md
2017-04-07 22:15:12 -04:00
Shel R
0b90a13f45 Merge branch 'master' into patch-1 2017-04-07 22:14:08 -04:00