aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,930 Commits
152 Branches
284 Tags
1.0 GiB
Commit Graph

214 Commits (c9f15f79913f3b79153fc0750c3eeafd26c26154)

Author SHA1 Message Date
Shel R c9f15f7991 Merge branch 'master' into patch-1
Shel R 9edee2e64f Merge branch 'master' into patch-1
Shel R c890b86ef6 Merge branch 'master' into patch-2
Shel R 7826b5e93d Merge branch 'master' into patch-1
Shel R c945f29e96 Merge branch 'master' into patch-1
Shel R cf03634e74 Merge branch 'master' into add-elao-com-instance
Shel R d7d165db5b Merge branch 'master' into add-infinimatix.net-instance
Shel R 7632178300 Merge branch 'master' into patch-1
Shel R 3e8c1a1c36 Merge branch 'master' into master
Shel R 1b42f717f2 Merge branch 'master' into master
Shel R 9981972844 Merge branch 'master' into patch-1
Shel R cf13c97cb2 Merge branch 'master' into master
Shel R 451b7431c9 Merge branch 'master' into patch-2
Shel R 6efaee30b1 Merge branch 'master' into patch-1
Shel R 05be34a94b Merge branch 'master' into master
Shel R e51b6bba94 Merge branch 'master' into patch-1
Shel R 4c05f0e630 Merge branch 'master' into patch-1
Shel R 7b7bff04df Merge branch 'master' into master
Shel R 5dfc9854f1 Merge branch 'master' into patch-1
Shel R 6d519e6fd1 Merge branch 'master' into patch-1
Shel R 065defefac Merge branch 'master' into patch-1
Shel R bc237d17a7 Merge branch 'master' into patch-1
Eugen a872f2f4c6 Merge pull request from benklop/patch-1 
Update Administration-guide.md
Eugen 32a6f0884c Merge pull request from huertanix/patch-2 
Update Heroku-guide.md
Ray Alez f113af5350 Add HackerNewsBot 
I have created a bot that will post Hacker News stories with 100+ points. Adding it to the list.
benklop f578cf8331 Update Administration-guide.md 
the syntax for running the rake task wasn't correct.
David Huerta a7ab2204d4 Update Heroku-guide.md 
Cleaning up the heroku admin command bit to match the form used in Administration-guide.md and clarify the wording a bit.
Eugen 0b32b5108e Merge pull request from d3vgru/master 
change suggested cipher for nginx
Eugen e2f024147c Merge pull request from mjankowski/mj-heroku-docs 
Update heroku instructions
seekr 131f505fd0 typo
Ed Knutson 27012aaeb6 change suggested cipher for nginx
Matt Jankowski 0f4fa59812 Update heroku instructions
foxiehkins 41396de7a9 Merge branch 'master' into master
Jantso Porali 786e6f94b9 Update Finnish translations, add sample Minio config ()
Eugen c392c54271 Merge pull request from johnsudaar/feature/scalingo_one_click 
Cosmetic changes to the scalingo deployment
VirtuBox c441208e29 Merge branch 'master' into patch-1
Alex Gleason a3d204e982 Linux users must enable NFS for Vagrant
Julien 6a88151eda Add meow.social
Lukas Fülling 30619a6716 add my instance
Ray Alez eadac4e7f4 Added an instance to the list 
Just launched https://hackertribe.io/, added it to the list.
Yann GUERN 0209b7d1b5 Update List-of-Mastodon-instances.md 
Add mastodon.land instance
Markus R c62696bc46 Update List-of-Mastodon-instances.md
Guewen FAIVRE 83530f0eef
Add mastodon.elao.com instance
Derek Lewis 73b8e67f4b Add infinimatix.net to instance list
Nick Gerakines d025c5e593 Added off-the-clock.us to the list of instances
Ninetailed 7aede8e720 Description in instance list for mastodon.ninetailed.uk
Thibaut (Eychics) eb98c99924 Add mastodon.nuzgo.net
ava 6b41fb2e6f Update List-of-Mastodon-instances.md
Brad Janke 65b3a2a5a6 Adds mtndevelopment
Ben Field 8fa8004a2b Update List-of-Mastodon-instances.md