fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-14 10:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
2529 commits 127 branches 266 tags 972 MiB
Commit graph

2529 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shel R cf80cb5e8b 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 315ff648c8 Merge branch 'master' into list-oulipo-social 2017-04-07 23:08:41 -04:00
Shel R 41923d1c6b Merge pull request #1186 from Aguay-val/patch-2 
Add mastodon.fun
 2017-04-07 23:07:50 -04:00
Shel R 63686fd36f Merge branch 'master' into patch-2 2017-04-07 23:05:08 -04:00
Shel R ae9d2f4a32 Merge branch 'master' into patch-1 2017-04-07 23:03:07 -04:00
Shel R 741bbba6ff Merge branch 'master' into patch-1 2017-04-07 22:59:07 -04:00
Shel R a25a384af3 Merge pull request #1107 from YDrogen/patch-1 
Added masto.razrnet.fr
 2017-04-07 22:54:44 -04:00
Shel R 971c4de18c Merge branch 'master' into patch-1 2017-04-07 22:54:25 -04:00
Shel R 394c8ef680 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 3c5b0c55cb Merge branch 'master' into master 2017-04-07 22:53:42 -04:00
Shel R 0dcf3c6abe Merge pull request #1085 from isati/patch-2 
Add manx.social instance
 2017-04-07 22:49:34 -04:00
Shel R b67b60fec3 Merge branch 'master' into patch-2 2017-04-07 22:49:14 -04:00
rbaumert 2c0ef75f58 fixed a sentence in readme 2017-04-07 19:48:46 -07:00
Shel R cc16fa7513 Merge pull request #1084 from genesixx/patch-4 
Update List-of-Mastodon-instances.md
 2017-04-07 22:48:02 -04:00
Shel R d6827e38a6 Merge branch 'master' into patch-4 2017-04-07 22:47:42 -04:00
Shel R 29ed448445 Merge pull request #1074 from kadiix/patch-1 
Add an instance.
 2017-04-07 22:47:00 -04:00
Shel R e7d7a99fbc Merge branch 'master' into patch-1 2017-04-07 22:46:36 -04:00
Shel R 8d27de32b3 Merge pull request #1069 from Awea/master 
Add an instance
 2017-04-07 22:45:15 -04:00
Shel R abab82ec1e Merge branch 'master' into master 2017-04-07 22:44:40 -04:00
Shel R f0797bf8ce Merge pull request #1066 from jack-michaud/master 
Add Northeastern University Mastodon
 2017-04-07 22:43:46 -04:00
Shel R 38c5130930 Merge branch 'master' into master 2017-04-07 22:43:13 -04:00
Shel R ee8af9083a Merge pull request #1051 from Tiwy57/patch-1 
Add an instance
 2017-04-07 22:42:34 -04:00
Shel R c9f15f7991 Merge branch 'master' into patch-1 2017-04-07 22:42:14 -04:00
Shel R 91afe1f8fd Merge pull request #1050 from lfuelling/patch-1 
add my instance
 2017-04-07 22:41:37 -04:00
Shel R 9edee2e64f Merge branch 'master' into patch-1 2017-04-07 22:41:07 -04:00
Shel R d7e1a282fe Merge pull request #1046 from raymestalez/patch-2 
Added an instance to the list
 2017-04-07 22:40:29 -04:00
Shel R c890b86ef6 Merge branch 'master' into patch-2 2017-04-07 22:39:59 -04:00
Valentin Ouvrard 5b571fc434 Merge branch 'master' into master 2017-04-08 13:39:31 +11:00
Valentin Ouvrard 3e4eb9c95f Merge branch 'master' into master 2017-04-08 13:39:09 +11:00
Shel R ceba26d527 Merge pull request #1041 from R0ckweb/patch-1 
Update List-of-Mastodon-instances.md
 2017-04-07 22:39:05 -04:00
Shel R 7826b5e93d Merge branch 'master' into patch-1 2017-04-07 22:38:37 -04:00
Shel R fc7b830719 Merge pull request #1036 from wirehack7/patch-1 
Update List-of-Mastodon-instances.md
 2017-04-07 22:37:51 -04:00
Shel R c945f29e96 Merge branch 'master' into patch-1 2017-04-07 22:35:45 -04:00
Shel R 0d4d42dce6 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 cf03634e74 Merge branch 'master' into add-elao-com-instance 2017-04-07 22:34:45 -04:00
Shel R 698d74a15f 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 d7d165db5b Merge branch 'master' into add-infinimatix.net-instance 2017-04-07 22:33:40 -04:00
Shel R d7f4300ee3 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 7632178300 Merge branch 'master' into patch-1 2017-04-07 22:23:50 -04:00
Shel R e4e948a21b Merge pull request #797 from AndreLewin/master 
Added Esperanto translation (eo)
 2017-04-07 22:21:48 -04:00
Shel R fef478781d Merge branch 'master' into master 2017-04-07 22:21:21 -04:00
Shel R c1a553d2c2 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 3e8c1a1c36 Merge branch 'master' into master 2017-04-07 22:17:53 -04:00
Shel R 9fd8bbe15c Merge pull request #992 from Eychics/master 
Add mastodon.nuzgo.net in instance list
 2017-04-07 22:16:49 -04:00
Shel R 1b42f717f2 Merge branch 'master' into master 2017-04-07 22:15:55 -04:00
Shel R 7004c69204 Merge pull request #991 from vladooku/patch-1 
Update List-of-Mastodon-instances.md
 2017-04-07 22:15:12 -04:00
Shel R 9981972844 Merge branch 'master' into patch-1 2017-04-07 22:14:08 -04:00
Shel R 5f61ef2417 Merge pull request #989 from MTNDevelopment/master 
Updates instance list
 2017-04-07 22:13:34 -04:00
Shel R cf13c97cb2 Merge branch 'master' into master 2017-04-07 22:13:06 -04:00
Shel R 90a408f592 Merge pull request #986 from estuans/patch-2 
Update List-of-Mastodon-instances.md
 2017-04-07 22:11:55 -04:00