Commit graph

235 commits

Author SHA1 Message Date
Shel R
210477bfb2 Merge branch 'master' into patch-1 2017-04-07 22:59:07 -04:00
Shel R
5e52f81d0b Merge branch 'master' into patch-1 2017-04-07 22:54:25 -04:00
Shel R
960bf1823f Merge branch 'master' into master 2017-04-07 22:53:42 -04:00
Shel R
b7d1d57035 Merge branch 'master' into patch-2 2017-04-07 22:49:14 -04:00
Shel R
6f121ae603 Merge branch 'master' into patch-4 2017-04-07 22:47:42 -04:00
Shel R
1cbf83dfd3 Merge branch 'master' into patch-1 2017-04-07 22:46:36 -04:00
Shel R
da91b207e9 Merge branch 'master' into master 2017-04-07 22:44:40 -04:00
Shel R
9ef164a3e2 Merge branch 'master' into master 2017-04-07 22:43:13 -04:00
Shel R
2caa1fa679 Merge branch 'master' into patch-1 2017-04-07 22:42:14 -04:00
Shel R
79875f5505 Merge branch 'master' into patch-1 2017-04-07 22:41:07 -04:00
Shel R
6c766318ac Merge branch 'master' into patch-2 2017-04-07 22:39:59 -04:00
Shel R
4062abe596 Merge branch 'master' into patch-1 2017-04-07 22:38:37 -04: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
Tristan Mahé
0bde1b7f4e updated instance hostname 2017-04-06 17:18:40 -07:00
Vladimir Mincev
272d25c383 Update Production-guide.md
Under ## General dependencies:
apt-get needs sudo and install was typed wrongly.
2017-04-07 01:05:32 +02:00
YDrogen
dc2ef960f7 Added masto.razrnet.fr 2017-04-06 23:59:56 +02:00
Tristan Mahé
0718e1d3dc Added pericles.world in the list of instances 2017-04-06 12:05:37 -07:00
isati
7053ff9f6d Add manx.social instance 2017-04-06 19:31:25 +01:00
Erwan Leboucher
075411f716 Update List-of-Mastodon-instances.md 2017-04-06 20:18:56 +02:00
kadiix
64fff28022 Update List-of-Mastodon-instances.md 2017-04-06 19:33:17 +02:00