79875f5505
Merge branch 'master' into patch-1
2017-04-07 22:41:07 -04:00
6c766318ac
Merge branch 'master' into patch-2
2017-04-07 22:39:59 -04:00
e08dfa6f32
Merge branch 'master' into master
2017-04-08 13:39:31 +11:00
8fb9960e92
Merge branch 'master' into master
2017-04-08 13:39:09 +11:00
4062abe596
Merge branch 'master' into patch-1
2017-04-07 22:38:37 -04:00
aa6f267117
Merge branch 'master' into patch-1
2017-04-07 22:35:45 -04:00
1b964ab4c2
Merge branch 'master' into add-elao-com-instance
2017-04-07 22:34:45 -04:00
95440a1ac3
Merge branch 'master' into add-infinimatix.net-instance
2017-04-07 22:33:40 -04:00
aa7ba961c8
Merge branch 'master' into patch-1
2017-04-07 22:23:50 -04:00
8a46f49140
Merge branch 'master' into master
2017-04-07 22:17:53 -04:00
aeb5f657d1
Merge branch 'master' into master
2017-04-07 22:15:55 -04:00
9cdf42ba65
Merge branch 'master' into patch-1
2017-04-07 22:14:08 -04:00
d42ddf0dad
Merge branch 'master' into master
2017-04-07 22:13:06 -04:00
cc3037296a
Merge branch 'master' into patch-2
2017-04-07 22:11:24 -04:00
05bb90718d
Merge branch 'master' into patch-1
2017-04-07 22:09:55 -04:00
8374ca6182
Merge branch 'master' into master
2017-04-07 22:08:54 -04:00
34ce7c6fb9
Merge branch 'master' into patch-1
2017-04-07 22:05:38 -04:00
fd94a0bece
Merge branch 'master' into patch-1
2017-04-07 21:59:21 -04:00
ba611ed3b2
Merge branch 'master' into master
2017-04-07 21:54:32 -04:00
9470afa4f3
Merge branch 'master' into patch-1
2017-04-07 21:49:18 -04:00
f3ee549b28
Merge branch 'master' into patch-1
2017-04-07 21:48:19 -04:00
7c7851a45c
Merge branch 'master' into patch-1
2017-04-07 21:44:16 -04:00
791dcac706
Merge branch 'master' into patch-1
2017-04-07 21:42:10 -04:00
c388df681f
Merge branch 'master' into patch-1
2017-04-07 21:34:41 -04:00
e8e607a356
Merge branch 'master' into patch-1
2017-04-07 19:46:07 -04:00
266cf6c3c2
Merge pull request #1204 from benklop/patch-1
...
Update Administration-guide.md
2017-04-08 01:00:32 +02:00
ecce87e858
Merge pull request #1200 from huertanix/patch-2
...
Update Heroku-guide.md
2017-04-08 01:00:06 +02:00
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
be8680df9a
Update Administration-guide.md
...
the syntax for running the rake task wasn't correct.
2017-04-07 16:31:50 -06:00
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
9efa356f9c
Update Heroku-guide.md
...
Removing some of the confusion around what format S3 bucket names and regions should be entered as well as providing an example of an S3 policy that follows best security practices for this sort of thing.
2017-04-07 17:29:21 -04:00
bf19455cf6
Add indigo.zone to list of instances
2017-04-07 14:10:37 -07:00
84b40fa940
Adds Oulipo.social to Mastodons list
...
This is a Mastodon with a particular constraint about
what symbols you can post.
2017-04-07 14:06:49 -07:00
b44df8f36c
Merge pull request #1191 from d3vgru/master
...
change suggested cipher for nginx
2017-04-07 23:02:49 +02:00
b1501669f9
Merge pull request #1172 from mjankowski/mj-heroku-docs
...
Update heroku instructions
2017-04-07 22:50:31 +02:00
7123e2cb5a
typo
2017-04-07 16:33:13 -03:00
b130db887e
change suggested cipher for nginx
2017-04-07 14:10:39 -05:00
8d5e4d3d74
Add mastodon.fun
2017-04-07 20:33:52 +02:00
f26e10dd99
Update heroku instructions
2017-04-07 12:50:29 -04:00
e21f876515
Merge branch 'master' into master
2017-04-07 14:01:20 +01:00
097db95bd3
Update Finnish translations, add sample Minio config ( #954 )
2017-04-07 12:58:12 +02:00
976e6797a1
Update List-of-Mastodon-instances.md
2017-04-07 11:54:41 +03:00
0bde1b7f4e
updated instance hostname
2017-04-06 17:18:40 -07:00
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
dc2ef960f7
Added masto.razrnet.fr
2017-04-06 23:59:56 +02:00
0718e1d3dc
Added pericles.world in the list of instances
2017-04-06 12:05:37 -07:00
7053ff9f6d
Add manx.social instance
2017-04-06 19:31:25 +01:00
075411f716
Update List-of-Mastodon-instances.md
2017-04-06 20:18:56 +02:00
64fff28022
Update List-of-Mastodon-instances.md
2017-04-06 19:33:17 +02:00
de555fdc55
Merge branch 'master' into patch-1
2017-04-06 19:32:31 +02:00
Shel R