Commit Graph

210 Commits

Author SHA1 Message Date
Valentin Ouvrard 8fb9960e92 Merge branch 'master' into master 2017-04-08 13:39:09 +11:00
Shel R aa6f267117 Merge branch 'master' into patch-1 2017-04-07 22:35:45 -04:00
Shel R 1b964ab4c2 Merge branch 'master' into add-elao-com-instance 2017-04-07 22:34:45 -04:00
Shel R 95440a1ac3 Merge branch 'master' into add-infinimatix.net-instance 2017-04-07 22:33:40 -04:00
Shel R aa7ba961c8 Merge branch 'master' into patch-1 2017-04-07 22:23:50 -04:00
Shel R 8a46f49140 Merge branch 'master' into master 2017-04-07 22:17:53 -04:00
Shel R aeb5f657d1 Merge branch 'master' into master 2017-04-07 22:15:55 -04:00
Shel R 9cdf42ba65 Merge branch 'master' into patch-1 2017-04-07 22:14:08 -04:00
Shel R d42ddf0dad Merge branch 'master' into master 2017-04-07 22:13:06 -04:00
Shel R cc3037296a Merge branch 'master' into patch-2 2017-04-07 22:11:24 -04:00
Shel R 05bb90718d Merge branch 'master' into patch-1 2017-04-07 22:09:55 -04:00
Shel R 8374ca6182 Merge branch 'master' into master 2017-04-07 22:08:54 -04:00
Shel R 34ce7c6fb9 Merge branch 'master' into patch-1 2017-04-07 22:05:38 -04:00
Shel R fd94a0bece Merge branch 'master' into patch-1 2017-04-07 21:59:21 -04:00
Shel R ba611ed3b2 Merge branch 'master' into master 2017-04-07 21:54:32 -04:00
Shel R 9470afa4f3 Merge branch 'master' into patch-1 2017-04-07 21:49:18 -04:00
Shel R f3ee549b28 Merge branch 'master' into patch-1 2017-04-07 21:48:19 -04:00
Shel R 7c7851a45c Merge branch 'master' into patch-1 2017-04-07 21:44:16 -04:00
Shel R 791dcac706 Merge branch 'master' into patch-1 2017-04-07 21:42:10 -04:00
Shel R c388df681f Merge branch 'master' into patch-1 2017-04-07 21:34:41 -04:00
Eugen 266cf6c3c2 Merge pull request #1204 from benklop/patch-1
Update Administration-guide.md
2017-04-08 01:00:32 +02:00
Eugen ecce87e858 Merge pull request #1200 from huertanix/patch-2
Update Heroku-guide.md
2017-04-08 01:00:06 +02:00
Ray Alez c96ef27f44 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
benklop be8680df9a Update Administration-guide.md
the syntax for running the rake task wasn't correct.
2017-04-07 16:31:50 -06:00
David Huerta 774b752498 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.
2017-04-07 17:44:32 -04:00
Eugen b44df8f36c Merge pull request #1191 from d3vgru/master
change suggested cipher for nginx
2017-04-07 23:02:49 +02:00
Eugen b1501669f9 Merge pull request #1172 from mjankowski/mj-heroku-docs
Update heroku instructions
2017-04-07 22:50:31 +02:00
seekr 7123e2cb5a typo 2017-04-07 16:33:13 -03:00
Ed Knutson b130db887e change suggested cipher for nginx 2017-04-07 14:10:39 -05:00
Matt Jankowski f26e10dd99 Update heroku instructions 2017-04-07 12:50:29 -04:00
foxiehkins e21f876515 Merge branch 'master' into master 2017-04-07 14:01:20 +01:00
Jantso Porali 097db95bd3 Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
Eugen d09a7460b3 Merge pull request #1042 from johnsudaar/feature/scalingo_one_click
Cosmetic changes to the scalingo deployment
2017-04-06 19:32:12 +02:00
VirtuBox 6aa0cf81bf Merge branch 'master' into patch-1 2017-04-06 19:11:39 +02:00
Alex Gleason 77924befb2 Linux users must enable NFS for Vagrant 2017-04-06 12:16:39 -04:00
Markus R d8db9d82c1 Update List-of-Mastodon-instances.md 2017-04-06 08:52:15 +02:00
Guewen FAIVRE 1cf59cbd8e Add mastodon.elao.com instance 2017-04-06 08:46:16 +02:00
Derek Lewis 217cf85c93 Add infinimatix.net to instance list 2017-04-06 01:15:16 -04:00
Nick Gerakines 88ae4714ff Added off-the-clock.us to the list of instances 2017-04-05 19:19:44 -04:00
Ninetailed 408c29a78b Description in instance list for mastodon.ninetailed.uk 2017-04-05 22:35:35 +01:00
Thibaut (Eychics) 8fcaf14e3c Add mastodon.nuzgo.net 2017-04-05 20:45:23 +02:00
ava 7fdf1f7381 Update List-of-Mastodon-instances.md 2017-04-05 21:44:13 +03:00
Brad Janke a5c7ec3bac Adds mtndevelopment 2017-04-05 13:14:27 -05:00
Ben Field c05a3a3569 Update List-of-Mastodon-instances.md 2017-04-05 18:20:08 +01:00
Christopher Gilbert f5a90c886a Add Rich.GOP 2017-04-05 13:05:27 -04:00
foxiehkins 4e2c148ed6 Update description on good-dragon.com 2017-04-05 17:49:04 +01:00
foxiehkins 46c54a92b2 Add good-dragon.com 2017-04-05 17:47:52 +01:00
Thomas Alberola 6aeaeb8b91 Adding masto.raildecake.fr, french instance 🌻🐘 2017-04-05 18:15:39 +02:00
ZiiX 018e2fc68c added instance 2017-04-05 09:05:57 -07:00
Amanda Visconti 4d226de556 Added digitalhumanities.club instance 2017-04-05 12:04:21 -04:00