Commit graph

198 commits

Author SHA1 Message Date
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
Shel R
ac2515e096 Merge branch 'master' into patch-1 2017-04-07 21:34:41 -04:00
Eugen
714156e409 Merge pull request #1204 from benklop/patch-1
Update Administration-guide.md
2017-04-08 01:00:32 +02:00
Eugen
9eefb51a2f Merge pull request #1200 from huertanix/patch-2
Update Heroku-guide.md
2017-04-08 01:00:06 +02:00
Ray Alez
5b2be91d40 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
36e31bf45e Update Administration-guide.md
the syntax for running the rake task wasn't correct.
2017-04-07 16:31:50 -06:00
David Huerta
7ab5218c65 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
f74fb89cbd Merge pull request #1191 from d3vgru/master
change suggested cipher for nginx
2017-04-07 23:02:49 +02:00
Eugen
895201fd9d Merge pull request #1172 from mjankowski/mj-heroku-docs
Update heroku instructions
2017-04-07 22:50:31 +02:00
seekr
231db3cdc1 typo 2017-04-07 16:33:13 -03:00
Ed Knutson
26b92ae438 change suggested cipher for nginx 2017-04-07 14:10:39 -05:00
Matt Jankowski
5a85b7f4fe Update heroku instructions 2017-04-07 12:50:29 -04:00
foxiehkins
f5a5571f64 Merge branch 'master' into master 2017-04-07 14:01:20 +01:00
Jantso Porali
fb0ce9d38d Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
Eugen
9df50099a1 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
4564e512e7 Merge branch 'master' into patch-1 2017-04-06 19:11:39 +02:00
Alex Gleason
d1527b2d94 Linux users must enable NFS for Vagrant 2017-04-06 12:16:39 -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
Jonathan Hurter
f210b2b7ef Make scalingo doc clearer 2017-04-05 17:48:55 +02:00
Kody
41f34e7412 Added im-in.space 2017-04-05 17:00:03 +02:00
shel
fd0096f899 Correct innacurate info and other fixes
This guide was pretty out of date and also contained outright errors which were never true. I have updated it.
2017-04-05 10:58:41 -04:00
Eugen
b89f37e445 Merge pull request #947 from johnsudaar/feature/scalingo_one_click
Add Scalingo deployment support
2017-04-05 16:50:46 +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
Jonathan Hurter
8752dc9186 Add doc 2017-04-05 16:00:48 +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